Swag McYolosteinen
8e19262d16
Merge pull request #4411 from scoopscoop/protolatherepeater
...
Clamp function fixed
2014-08-13 18:41:58 +02:00
scoopscoop
f5b5c7c84f
Clamp function fixed
2014-08-13 19:30:35 +03:00
Swag McYolosteinen
681990a835
Merge pull request #4364 from scoopscoop/sciencemineralnotice
...
Ore redemption machine mineral availability notice
2014-08-12 22:22:36 +02:00
Cheridan
cb4c589c80
Merge pull request #4387 from Incoming5643/fireball
...
Magic Mania 1.67: Great Balls of Fireballs
2014-08-12 12:33:50 -05:00
scoopscoop
b14535344b
Rewrote request console code to use a proc when generating a message on a target console
...
Redemption machine now sends a message to chemistry, too.
2014-08-12 13:56:02 +03:00
Alex
ff25503b4d
Merge pull request #4384 from Ikarrus/deputybands
...
[MAP] Boxstation Update and Deputy Armbands
2014-08-12 08:12:15 +01:00
Alex
b05b214d79
Merge pull request #4344 from Aranclanos/removewarn
...
Removes warn button on the player panel.
2014-08-12 08:08:21 +01:00
Alex
9cfb19f511
Merge pull request #4373 from paprka/deepgunlore
...
Whole bunch of gun-related stuff
2014-08-11 16:25:05 +01:00
Alex
d5e578c6aa
Merge pull request #4356 from paprka/minerals
...
Asteroid mineral turfs rates and rescaling
2014-08-11 14:03:11 +01:00
Alex
12b8bba238
Merge pull request #4362 from paprka/borghailer
...
Adds sec hailer to secborg modules
2014-08-11 14:02:51 +01:00
Alex
c9bfc556e7
Merge pull request #4345 from Aranclanos/dielighting
...
Removes lights from the machinery process() list
2014-08-11 13:58:05 +01:00
Swag McYolosteinen
55a11982da
Merge pull request #4361 from paprka/swatremoval
...
Replaces swat helmet for syndicates
2014-08-11 12:15:56 +02:00
Incoming
41596a0974
Magic Mania 1.67: Great Balls of Fireballs
...
Changes the wand of fireball projectile to have the same !!FUN!! proximity detonation properties as the spell version. Slightly moved the damage types from getting hit by the fireball around to better simulate the experience.
Fun fact about spell fireballs: Because the projectile is desiged to explode if it comes within a square of somebody who isn't the wizard direct contact between fireballs and mobs is very rare. This means that while the fireballs are designed to do an extra 25 brute and 20 burn ON CONTACT this usually doesn't happen.
That's why the added damage on the wand here isn't 25/20, because that would actually make it signigicantly better than the spell.
2014-08-10 20:12:49 -04:00
Swag McYolosteinen
d0a2d94ea9
Merge pull request #4331 from scoopscoop/protolatherepeater
...
Allows the protolathe to build multiples of items.
2014-08-10 10:24:24 +02:00
paprka
e3c26bfdd1
Merge remote-tracking branch 'remotes/upstream/master' into deepgunlore
...
Conflicts:
code/game/objects/items/weapons/storage/uplink_kits.dm
2014-08-09 16:19:33 -07:00
ikarrus
22e0081cf3
Resolved Conflicts:
...
code/game/objects/items/weapons/storage/boxes.dm
2014-08-09 14:19:43 -06:00
ikarrus
3c96428603
[MAP] Boxstation Update and Deputy Armbands
...
-Singularity engine is now sealed off from outer space, making it more secure from saboteurs and safe from meteors
-Deputy armbands (red) added to HoS office. These can be ad-hoc distributed by the HoS when deputizing crew
-Slight remap of HoS office to fit everything in there. added a filing cabinet and paper, too
-Shutters added under robotics and R&D's primary hallway windows
-Filing cabinet and paper added in bridge
2014-08-09 14:11:04 -06:00
Aranclanos
837428babd
Merge pull request #4370 from hornygranny/badmins
...
admins can't edit their rank's powers
2014-08-09 17:02:28 -03:00
Aranclanos
866bf55b48
Merge pull request #4377 from Jordie0608/ogdensnutgoneflake
...
Fixes #4338 multiple weed nodes on turf
2014-08-09 16:21:32 -03:00
Aranclanos
97c087db27
Merge pull request #4379 from paprka/lolindents
...
Fixes security hardsuit SSU
2014-08-09 16:19:42 -03:00
Cheridan
365de76240
Merge pull request #4340 from MrPerson/giacom_was_right_I_should_have_just_deld_mobs
...
Make new_players dereference from their mind when observing
2014-08-09 11:19:07 -05:00
paprka
7282f44b5f
lol indentations
2014-08-08 10:16:48 -07:00
Jordie0608
1ed6d7921c
stops doubling of weed nodes
2014-08-09 01:54:16 +10:00
Alex
b5423346e4
Merge pull request #4307 from Zelacks/alienimagefix
...
Fix for Alien Infection Image
2014-08-08 15:12:37 +01:00
paprka
a65d26f792
Merge remote-tracking branch 'remotes/upstream/master' into deepgunlore
...
Conflicts:
code/modules/projectiles/projectile.dm
2014-08-08 06:48:17 -07:00
Swag McYolosteinen
1177b3f3ad
Merge pull request #4348 from Firecage/NANOABSOLUTES
...
Nanoabsolutes
2014-08-08 12:16:13 +02:00
Swag McYolosteinen
63692588b9
Merge pull request #4346 from Firecage/FUCKINABSOLUTEPATHS
...
CLUCKING ABSOLUTE PATHS
2014-08-08 12:15:22 +02:00
paprka
64bc2abec3
sprite and fix
2014-08-07 14:52:40 -07:00
paprka
726b939754
whole bunch of gun stuff
2014-08-07 14:39:31 -07:00
Hornygranny
c538030790
admins can't edit their rank's powers
2014-08-07 12:00:48 -07:00
scoopscoop
9d47d2c98e
Now uses a proc that generates messages on target console
...
Basically gutted topic code.
2014-08-07 18:38:09 +03:00
scoopscoop
98739e8510
This sounds better
2014-08-07 15:12:17 +03:00
paprka
8c4bde6be8
adds secborg hailer
2014-08-07 05:00:10 -07:00
paprka
10f6ca8c7e
removes swat helmet
2014-08-07 04:47:55 -07:00
paprka
6770f6fdda
second rates
2014-08-07 00:02:03 -07:00
paprka
d41a469ff4
Merge branch 'master' of https://github.com/tgstation/-tg-station into goodbyedeadspace
...
Conflicts:
code/game/mecha/mecha.dm
2014-08-06 15:22:56 -07:00
Firecage
129865d565
Giacom Fixes
2014-08-06 20:22:36 +02:00
Firecage
9732b3a254
Absolute paths for 3 nanoUI files
...
...
...
2014-08-06 19:02:30 +02:00
Firecage
8ee10c4940
Merge branch 'master' of https://github.com/tgstation/-tg-station.git
...
FUCK SPACES
Merge branch 'AIcode'
Merge branch 'Foodstuffssss'
Merge branch 'master' of https://github.com/tgstation/-tg-station.git
Merge branch 'girderwrenchtime'
Merge branch 'Chamjumpsuit'
Merge branch 'Bookcasefix'
Merge branch 'Assemblyfix'
Merge branch 'metroidbegone'
Merge branch 'master' of https://github.com/tgstation/-tg-station.git
Merge branch 'master' of https://github.com/tgstation/-tg-station.git
FUCKING ABSOLUTE PATHS
2014-08-06 19:02:28 +02:00
Firecage
40de38f252
moremoarmoaaaaarabsolutes
2014-08-06 16:54:06 +02:00
Firecage
24972ccc5c
ABSOLUTELY ABSOLUTE
2014-08-06 16:21:24 +02:00
Firecage
510b20a8e5
MoarABSOLUTEPATHS
2014-08-06 15:51:40 +02:00
Firecage
88be87e8d3
FUCKING ABSOLUTE PATHS
2014-08-06 15:15:56 +02:00
scoopscoop
6816f4cd5c
The ore redemption machine in cargo now sends a message to the science department through the request console that new minerals are available
2014-08-06 13:33:57 +03:00
scoopscoop
19a5573cbf
woo
2014-08-06 13:32:21 +03:00
Aranclanos
55dd64fdc2
Adds static power value on areas. These variables should replace machines on the process list, that are only there to consume power.
...
This commit removes lights from the process list, about 500 of them on the current map.
The purpose of this is to reduce lag from the master controller ticker.
2014-08-06 06:57:52 -03:00
Alex
c79b9fe6bf
Merge pull request #4336 from Incoming5643/bluepanties
...
Magic Mania 1⅔: Fixes #4335
2014-08-06 10:41:07 +01:00
Aranclanos
12242cad7d
Removes the unused and useless warn button on the player panel.
2014-08-06 03:43:28 -03:00
MrPerson
c813d9df46
Make new_players GC when observing
...
When observing, that observer would be given their original new_player's mind, but that mind would still have the new_player as its current. This caused the new_player to fail to GC and resulted in the observer's mind's current becoming null.
Fix: Just delete the new_player mind when the player observes. If an admin turns them into a human or whatever, a new mind will be created automatically then.
2014-08-05 18:50:09 -07:00
Incoming
879f5d7c0e
Changed it!
2014-08-05 19:51:08 -04:00
