255bb90996
Fixed #1572 You can no longer farm infinite fire alarm electronics.
2013-12-22 17:08:02 +01:00
58d0ed5221
Merge pull request #2094 from RobRichards1997/19/12/2013-Sec-see-Sec-Sprites
...
Security Sprite updates.
2013-12-21 15:24:14 -08:00
40929b37d3
Merge pull request #2093 from Giacom/small_fixes_and_tweaks
...
Small Tweaks and Fixes
2013-12-21 15:12:01 -08:00
f00c80bd43
Merge pull request #2104 from Giacom/gulag_therevenge
...
[MAP] The Gulag: The Revenge: Part 2.5
2013-12-21 15:05:57 -08:00
e7579e2aa8
Merge pull request #1986 from Perakp/janitorCartFix
...
Fixes janiborg interaction with janicarts
2013-12-21 15:01:37 -08:00
b12f996512
Merge pull request #2106 from Bobylein/labcoats
...
Allows Labcoats to store Bottles, Beakers, Pills, Pill Bottles and Paper...
2013-12-21 13:58:13 -08:00
516ec6076d
Merge pull request #2102 from Razharas/Flamethrower
...
Fixes flamethrowers shooting through stuff
2013-12-21 13:57:33 -08:00
5fb0d05dd1
Merge pull request #2096 from Aranclanos/SweetLindaNobodyWillTouchYou
...
Small fixes for Linda.
2013-12-21 13:57:15 -08:00
f713a3368d
Merge pull request #2100 from Razharas/MechShit
...
Fixes mechs click through windows and what not
2013-12-21 13:56:21 -08:00
24676cb23c
Merge pull request #2091 from Razharas/ChemDesp
...
Fixes chem dispenser properly
2013-12-21 13:56:04 -08:00
9d24a900ae
Merge pull request #2066 from Perakp/slipFix4
...
No slipping when lying down
2013-12-21 13:54:39 -08:00
5fe1413363
Merge pull request #2083 from Razharas/Shame
...
Fixes add_log being used in an obsolete way
2013-12-21 13:46:34 -08:00
949fedceda
Merge pull request #2067 from Deantwo/master
...
Shuttle launch timer cannot be shortened when less than 11 seconds are left
2013-12-21 13:45:27 -08:00
bcfcb3a9cf
Merge pull request #2073 from Jordie0608/ShakeTheRoom
...
Gibbing borgs explode violently
2013-12-21 13:42:59 -08:00
16cb706b79
Merge pull request #2062 from Aranclanos/RnDConsole
...
RnD console runtimes fix.
2013-12-21 13:38:32 -08:00
90ecfcbc4b
Merge pull request #2063 from Nienhaus/master
...
Posters
2013-12-21 13:37:20 -08:00
e3f82955e4
Merge pull request #2080 from Razharas/no
...
Fixes morgue trays used by ghosts and what not
2013-12-21 01:12:04 -08:00
c40af6ae40
Update icons after item is placed in cart.
2013-12-21 09:50:15 +02:00
65e0931d55
Merge branch 'master' into janitorCartFix
...
Conflicts:
code/game/objects/items/weapons/storage/storage.dm
2013-12-21 09:40:06 +02:00
20a57b9917
Merge pull request #2030 from KazeEspada/gunhardest
...
Gun HARDEST!
2013-12-20 23:18:55 -08:00
fe0e995959
Allows Labcoats to store Bottles, Beakers, Pills, Pill Bottles and Papers in their suit slot.
2013-12-21 07:47:47 +01:00
47545f439e
* Added ore boxes to the gulag, and added a conveyor belt which goes outside and has a loading machine, which will take the ore from the orebox.
...
* Added sprites for the stacking machine going in the reverse direction, just set the dir to 1 instead of 2.
* Added prison intercoms which will not broadcast until someone hacks it. Added these intercoms in the gulag, the perma brig and the brig cells.
* When a prisoner has received enough points for freedom, if they try to move the shuttle, or open the middle door, while someone is on it they will get an error message. This way there is no way for a free'd prisoner to release their fellow prisoners once they have reached their point target. The shuttle will depart right away when you call the shuttle from the stacking console, to stop prisoners from getting on while it departs.
2013-12-20 22:09:06 +00:00
046714d864
Merge pull request #2092 from Giacom/grab_monkey
...
Monkeys no longer wander off when being pulled or grabbed.
2013-12-20 11:44:25 -08:00
ae6a4d9b18
Fixes flamethrowers shooting through stuff
...
Fixed #2059
They need to be fixed more, but thats a theme for another PR
2013-12-20 22:57:41 +04:00
18eab51794
Fixes mechs click through windows and what not
...
I ded plz fix
2013-12-20 18:05:06 +04:00
a03c5ba388
Merge pull request #2081 from Razharas/brakes
...
Fixes trunks being unwelded while under machinery
2013-12-19 22:31:32 -08:00
e44e31f8c9
Merge pull request #2077 from Razharas/fix
...
Fixes soil being wrenchable
2013-12-19 22:05:47 -08:00
0f016a054f
Merge pull request #2078 from Razharas/train
...
Fixes chameleon projector
2013-12-19 21:54:17 -08:00
213f3fff31
Some fixes for Linda, now the Move() proc of objects that block air is different. Example below.
...
object/Move()
var/turf/T = loc
..()
move_update_air(T)
2013-12-19 22:13:21 -03:00
f8c05e2169
Security Sprite updates.
...
Replaces all instances of the old Swat and riot sprites with Validsalad's new ones
Replaces Sechailer's with Officer, Warden and HoS versions code and Sprites wise (Sptires by Validsalad again)
The officer gas mask is gas/sechailer, the warden's is gas/sechailer/warden and the HoS's is gas/sechailer/hos
2013-12-19 23:14:51 +00:00
891d5e37f8
Merge pull request #2079 from Razharas/has
...
Fixes beepsky stunning people in things
2013-12-19 15:03:19 -08:00
80f2076bcc
* Fixed the party alarm from only working in areas with a certain light level.
...
* Reduced a lot of duplicated code in the party alarm.
* Added a shield range variable for the anti-breach shield generators.
* Changed the shield range to 4, making them more useful.
* Fixed a bug with the deployed_shields list not being cleared after the shields are down.
* Fixed a runtime with shake_camera()
2013-12-19 22:07:52 +00:00
0fdcd42592
Merge pull request #2054 from Cheridan/Nuke
...
Nuke Ops Tweaks: Flamer and Mechas
2013-12-19 13:37:32 -08:00
c917999f2f
* Monkeys no longer wonder off when being pulled or grabbed.
...
* Fixed the grabbed_by list not being emptied when the grab is deleted.
* Removed duplicated use of grabbed_by.
* Undef'd defines which are only used in a single file.
2013-12-19 20:41:19 +00:00
5e3997e0e2
Fixes chem dispenser properly
...
Fixed #2051
2013-12-20 00:30:35 +04:00
a864158f74
Merge pull request #2068 from Aranclanos/GiaYouGiganticFaggot
...
hand labelers on pill bottles fix.
2013-12-19 11:56:01 -08:00
9bede23a24
Merge pull request #2075 from Razharas/The
...
Fixes facial hair styles not working properly
2013-12-19 11:53:45 -08:00
fbe24b46ac
Merge pull request #2071 from Giacom/viro_streamline
...
Virology Feedback Tweaks
2013-12-19 10:51:08 -08:00
8ba3859b2d
Merge pull request #2069 from Aranclanos/pAIBioscan
...
pAI bioscan runtime fix
2013-12-19 10:41:07 -08:00
55063ef171
Woopsy daisy
...
Thats what horrible abominations of intext checks do to you
Fixed #2088
2013-12-19 20:28:31 +04:00
c03d7128c4
Yeah
...
I suck cocks
2013-12-19 17:42:29 +04:00
f7293d8fa1
Fixes add_log being used in an obsolete way
...
>Contributors checking before commiting
>Maintainers checking before merging
Ahahahaha
2013-12-19 06:31:42 +04:00
33a315a111
Switched position with gib
2013-12-19 12:48:14 +11:00
1a2553dc33
This wasnt supposed to be deleted
2013-12-19 00:46:10 +04:00
691ea75b45
Fixes trunks being unwelded while under machinery
2013-12-19 00:38:14 +04:00
2f70aaadb3
Removes magic numbers and an useless check
...
- it shouldn’t runtime.
2013-12-18 22:31:07 +02:00
1ce0b11b0d
Fixes morgue trays used by ghosts and what not
2013-12-19 00:23:36 +04:00
5f459cd834
Fixes soil being wrenchable
2013-12-19 00:08:48 +04:00
5dffd2cfe9
Fixes beepsky stunning people in things
2013-12-19 00:04:19 +04:00
bce9e5d826
Fixes chameleon projector
2013-12-19 00:01:59 +04:00
Miauw
Aranclanos
Giacom
Cheridan
Perakp
Bobylein
Razharas
Robson Richards
Jordie0608