5abb553f4a
Merge branch 'master' of https://github.com/tgstation/-tg-station into warnstandardization
...
Conflicts:
code/_onclick/telekinesis.dm
2014-04-08 14:29:58 +02:00
3acd999080
Merge pull request #3329 from phil235/DisposalPipeFix
...
Disposal bin deconstruction fix
2014-04-08 02:04:51 -05:00
03b34893d5
Merge pull request #3343 from Giacom/small_fixes
...
Fixes being able to change your chameleon jumpsuit's colour while dead.
2014-04-07 18:48:05 -07:00
42308da24d
Merge pull request #3298 from Kelenius/hydrofix
...
Fixing banana peel
2014-04-07 18:39:53 -07:00
4e7ac41ba4
Merge pull request #3346 from Iamgoofball/FUCKMONKEY
...
Removes a bunch of ticker.mode.name == "monkey" checks, since monkey doesn't even exist anymore
2014-04-07 18:30:30 -07:00
c9bd6c3688
Merge pull request #3296 from Ikarrus/alarmdelay
...
Alarm Delay Reduction
2014-04-07 14:04:50 -05:00
8a9a1c3260
Merge pull request #3289 from Firecage/master
...
Morphing Clown Mask!
2014-04-07 11:10:26 -07:00
417a4ed070
Merge pull request #3333 from Giacom/config_allow_ooc
...
Added a configuration option that disables OOC during the round automatically.
2014-04-07 12:14:53 -05:00
3531c1d169
Merge branch 'master' of git://github.com/tgstation/-tg-station
2014-04-07 19:01:35 +02:00
d0dc3f3af4
Merge pull request #3330 from phil235/Biogeneratorfix
...
Add message when loading container into the biogenerator
2014-04-07 05:00:01 -05:00
810b91e7ac
removes a ton of things checking the ticker to see if it's monkey, a gamemode that no longer exists.
2014-04-06 11:46:12 -07:00
ce8baeabb9
Fixes being able to change your chameleon jumpsuit's colour while dead.
...
Fixed an oversight with the red syndicate suits in the random uplink kit.
2014-04-06 15:16:22 +01:00
e41dd607b5
Better comment.
2014-04-06 14:27:28 +01:00
cb4e338318
Fixes a bug with Cyborgs losing their emag module if they were emagged as a default cyborg and they transform.
2014-04-06 14:07:09 +01:00
c67334c929
Added a configuration option that disables OOC during the round automatically. Defaults to allowing OOC during the round.
2014-04-05 19:41:47 +01:00
95733ee3ea
Merge pull request #3280 from MrPerson/mining_vouchers
...
Fix the "use mining voucher many times" bug
2014-04-05 19:00:35 +02:00
ab181299dd
Merge pull request #3279 from fleure/braid
...
Fixes floorlength braid sprite
2014-04-05 18:48:02 +02:00
39a077761c
Merge pull request #3264 from Menshin/Wizarditis_and_inv
...
Fixed "update inventory X" procs and clothes from wizarditis not showing
2014-04-05 18:43:40 +02:00
732e02d393
Merge pull request #3302 from MrPerson/qdel_runtime_disposal
...
Fixes for a disposal runtime everytime something got flushed
2014-04-05 18:09:04 +02:00
9bdb8b0e96
Merge pull request #3309 from Krypt0n33/human-burger-fix-2
...
Fixes #3293
2014-04-05 18:04:41 +02:00
b095a3458c
one missing period. derp
2014-04-05 18:02:40 +02:00
2a3924820f
Add message when loading container.
...
* Add message when loading container.
* Change 'beaker' to 'container' (to include buckets)
2014-04-05 18:00:04 +02:00
52ecffde76
Merge pull request #3306 from Aranclanos/DisposalAir
...
Fixes issue #2330 . Disposals not activating the turf air.
2014-04-05 17:59:19 +02:00
21cb80b79e
fixing CP var
2014-04-05 17:35:12 +02:00
d07450ad47
Adds message at end of pipe slicing
...
* Adds message at the end of pipe slicing operation.
* Simplify code checking if player/tool moves during pipe slicing.
* adds span class everywhere.
2014-04-05 17:22:04 +02:00
5a6e9804b9
Bin&outlet can be deconstructed even with destroyed trunk
...
Fixes the bug where you can't deconstruct the bin/outlet after the trunk below it has been destroyed (usually by an explosion) and you can't replace the trunk with the bin/outlet in the way.
2014-04-05 16:44:22 +02:00
5626ad9bbc
Merge pull request #3275 from Aranclanos/TeleportersFix
...
Fixes and some minor changes regarding teleports/portals code.
2014-04-03 22:05:45 -07:00
aa80ee0f29
human-burgers now eject correctly
2014-04-03 22:50:02 +02:00
e3836fa43e
Fixes issue #2330
...
Makes disposal outlets activate the turf once they eject air to it.
2014-04-03 16:07:40 -03:00
6748fafb52
Merge pull request #3248 from AnturK/nothinglikeasmellofplasmainthemorning
...
Fix for freezing plasma from chemistry
2014-04-03 20:43:17 +02:00
a3016c8229
Fixes for a disposal runtime everytime something got flushed
2014-04-03 11:02:32 -07:00
8b8bf8b690
Merge branch 'master' of git://github.com/tgstation/-tg-station.git
2014-04-03 17:48:04 +02:00
b7243b94c1
Fixing banana peel
2014-04-03 16:00:07 +04:00
1098b7e498
Merge branch 'master' of https://github.com/tgstation/-tg-station into RDfix
2014-04-03 15:38:07 +04:00
f7e3737f3f
Span classes yaaaaay
2014-04-03 15:37:53 +04:00
51769a1697
Alarm Delay Reduction
...
Reduced motion alarm delay from 10 to 3 seconds.
Reduced alarm display delay from 10 to 3 seconds.
This means that motion cameras will only take 6 seconds to report an intruder instead of 20+
Other alarms (camera, fire, atmos) will be reported after 3 seconds instead of 10.
2014-04-02 22:47:22 -06:00
f46cb302a4
Updated to work with newer cyborg code.
2014-04-02 22:12:36 -06:00
f705141fce
Resolved Conflicts:
...
code/datums/wires/robot.dm
2014-04-02 20:23:31 -06:00
5b815c8d01
Merge pull request #3267 from Cheridan/Singu
...
Improved Singularity Ex_act()
2014-04-02 16:52:15 -07:00
088553ee4b
Signed-off-by: Firecage <firecage@hotmail.com>
2014-04-03 00:32:44 +02:00
ed466a4c67
Customizable clown mask with 2 new options
2014-04-02 23:19:55 +02:00
1b10254a25
Reverts my and Incoming's April Fools
2014-04-02 20:03:17 +02:00
c61fcbd5ed
Merge pull request #3230 from Donkie/foodmask
...
You can no longer eat/drink or consume pills while having a mask/helmet covering your mouth.
2014-04-02 10:31:32 -07:00
e8d7526a0c
Merge branch 'master' of https://github.com/Giacom/-tg-station into sec_maglite
2014-04-02 17:11:52 +01:00
157818b9b0
Fix the "use mining voucher many times" bug
2014-04-02 07:56:03 -07:00
19f7c691d6
Fixes floorlength braid sprite
2014-04-02 15:38:17 +01:00
fc915bf800
If you try to use the teleporter and the teleport was rejected for any reason (like having a nuclear disk), you won't get the chance to get a random damage from the teleport.
...
Fixes issue #2236 .
Removed some spawn() calls.
Removed the chance of fail from the portal effects (the blue portals made with hand teleporters).
The portal datums will now return 0 if the teleport failed, and now use a new proc, start(), instead of New() to handle themselves.
Standarized teleport.dm from the helper_datums folder.
Removed the checks for centcomm z level and away missions z level for teleports. Now you can go there.
changed the /red messages from the teleports datum to span classes.
The "[something] bounces off of the portal!" were replaced for "The portal rejects [something]".
Removed an extra "the" on those messages.
2014-04-02 08:36:33 -03:00
412ac0fb38
Improved Singularity Ex_act()
2014-04-01 15:26:48 -05:00
24e1e89afb
Merge pull request #3260 from Incoming5643/Realism
...
Minor fix to improve realism
2014-04-01 19:55:33 +02:00
f411ccaad6
* Fixed the update_inv_* functions to actually update the inventory HUD even if the inventory is closed (that should fix items presents in the inventory but invisible).
...
* Fixed clothes from wizarditis not appearing on character and inventory.
2014-04-01 19:33:38 +02:00
Miauw
Cheridan
Razharas
Firecage
iamgoofball
Giacomand
phil235
Krypt0n
Aranclanos
MrPerson
Kelenius
Razharas
ikarrus
fleure
Menshin