Commit Graph

14294 Commits

Author SHA1 Message Date
SamCroswell
55e55e7c91 Minor Security Update
- Fixes seclite inhand, updates to the newer seclite icon.
- Corporate security outfits now spawn with the rest of the security
wardrobe.
2014-12-01 21:15:27 -05:00
SamCroswell
b2dee687aa Head of Security Items Update
- HoS jacket can now be buttoned or unbuttoned with a verb.
- The HoS now only gets the jacket and hat he spawns with.
( I verified the HoS spawns with a jacket and hat no matter if they
latejoined or were HoS from the start of the shift)
2014-11-30 22:22:01 -05:00
Fox-McCloud
6ba65ed1c7 Merge pull request #10 from nicky89107/master
Fixes handcuff log. All other commits have been reverted.
2014-11-30 21:18:55 -05:00
Fox-McCloud
08dbeb7304 Merge pull request #17 from Markolie/master
Map fixes
2014-11-30 21:18:16 -05:00
Fox-McCloud
934550d268 Reagent Rebalance 2014-11-30 21:05:35 -05:00
Markolie
b8d361bedb Map fixes 2014-12-01 02:41:42 +01:00
Tigercat2000
8ac21a4f1b Finishes Revert f91c140 2014-11-30 16:25:31 -08:00
Tigercat2000
91e4498792 Revert "Allow's slime people to make a squishing sound with *squish"
This reverts commit 2d67449c6f.
2014-11-30 16:20:14 -08:00
Tigercat2000
48cfaa7f54 Revert "Changed a couple lines to be more serious."
This reverts commit dd25c9e4a3.
2014-11-30 16:19:57 -08:00
Tigercat2000
f91c1400b6 Revert "Makes the gibber Ultra-Dramatic."
This reverts commit 0e99339d52.

Conflicts:
	code/game/machinery/kitchen/gibber.dm
2014-11-30 16:19:14 -08:00
Fox-McCloud
5900a139dc Merge pull request #16 from FalseIncarnate/master
Prevent AI from using Teleporter
2014-11-30 18:35:20 -05:00
FalseIncarnate
be536a658d Prevent AI from using Teleporter
Stops the AI from relocating itself via the teleporter.
2014-11-30 18:09:12 -05:00
Markolie
c23d7e2e43 AI should now be able to examine things 2014-11-30 23:07:07 +01:00
Markolie
c7acac268a Map fixes, hydroponics wrenching fix, adds satchel to scientist's locker 2014-11-30 22:03:44 +01:00
Tigercat2000
d70ca5acb2 Fix's the handcuffing logs to be Officer > Cuff-ee instead of Cuff-ee >
Officer
2014-11-30 12:54:09 -08:00
Tigercat2000
2d67449c6f Allow's slime people to make a squishing sound with *squish 2014-11-30 12:22:59 -08:00
Markolie
b820c1781d Make sure observers can read photos/paper bundles 2014-11-30 20:14:19 +01:00
Markolie
0bf46a71b1 Map changes, bug fixes 2014-11-30 20:10:34 +01:00
Fox-McCloud
4b2e3beb96 Weapon Changes 2014-11-30 08:18:29 -05:00
Fox-McCloud
43f3539b94 Merge pull request #11 from Fox-McCloud/Tech-Shells
Tech Shells
2014-11-30 06:44:57 -05:00
Fox-McCloud
805c638adf Tech Shells 2014-11-30 06:36:31 -05:00
Tigercat2000
dd25c9e4a3 Changed a couple lines to be more serious. 2014-11-29 22:50:22 -08:00
Fox-McCloud
72b43c3c1e Merge pull request #8 from SamCroswell/master
Dress Up Fix
2014-11-30 00:23:18 -05:00
Fox-McCloud
abe86667ca Merge pull request #7 from Markolie/master
Fixes drone talk
2014-11-30 00:23:10 -05:00
Fox-McCloud
9a391827b6 Shotgun and Sprite Updates 2014-11-30 00:09:47 -05:00
Tigercat2000
0e99339d52 Makes the gibber Ultra-Dramatic. Can be toggled on and off via the
'dramatic' variable.
2014-11-29 20:50:31 -08:00
SamCroswell
580dd00c1d Dress Up Fix 2014-11-29 23:22:59 -05:00
Markolie
8d93085560 Prevent AI from using spec ops shuttle 2014-11-30 04:10:07 +01:00
Markolie
74eb9424af Fixes drone talk 2014-11-30 03:57:39 +01:00
Fox-McCloud
bfa1536e74 Merge pull request #6 from Markolie/master
Fix basic energy gun runtime
2014-11-29 21:20:41 -05:00
Markolie
ced6357e9b Fix basic energy gun runtime 2014-11-30 02:36:35 +01:00
Tigercat2000
34d4bb0da4 Whoops, Left in some unfinished code, removed 2014-11-29 17:18:00 -08:00
Tigercat2000
28bff4161e Makes unable to scan message red instead of blue 2014-11-29 16:57:12 -08:00
Tigercat2000
7512adf2f5 Fixes a potentially abusable bug involving the chameleon projector and
playing cards.
2014-11-29 16:54:49 -08:00
Markolie
3de68526d4 Add autopsy data for stunning and bullets 2014-11-29 23:10:00 +01:00
Markolie
39eada12ba Move service channel to :z 2014-11-29 22:07:50 +01:00
Markolie
af9aeaaf84 Autotraitor fixes 2014-11-29 21:59:57 +01:00
Markolie
bd11c78235 Replace every instance of NanoTrasen with Nanotrasen. 2014-11-29 21:01:29 +01:00
Markolie
412e087d7e NTSL addition for service 2014-11-29 21:01:20 +01:00
Markolie
0dc52900cc Adds the service channel (:v) 2014-11-29 21:01:19 +01:00
Fox-McCloud
f85def5f09 Hug Nerf 2014-11-29 10:09:57 -05:00
Fox-McCloud
3b884622c5 Job Changes 2014-11-29 09:10:31 -05:00
Markolie
35fa4600e7 Merge branch 'master' of https://github.com/Markolie/Paradise 2014-11-29 02:39:45 +01:00
Markolie
dbe0cbfad8 consistency 2014-11-29 02:10:32 +01:00
Markolie
e143279ce0 Correction 2014-11-29 02:09:22 +01:00
Markolie
ae8f08e2b8 Fixes reflection, various security level fixes, gamma armory update, communication console fixes 2014-11-29 02:05:42 +01:00
Fox-McCloud
0128878100 Merge pull request #535 from Fox-McCloud/Species-Guns
Species guns
2014-11-28 19:24:55 -05:00
Fox-McCloud
053d79b04c Merge pull request #494 from LazureusFalcone/patch-1
Update lib_machines.dm
2014-11-28 19:24:28 -05:00
Fox-McCloud
a4c72d4603 Species and Guns 2014-11-28 19:13:41 -05:00
Markolie
7e544c17bc Fix DNA Injectors with abilities, adds mob's name to autopsy data 2014-11-28 21:14:00 +01:00