Commit Graph

2746 Commits

Author SHA1 Message Date
SkyMarshal
764432e4e8 Fixed minor errors. 2011-12-08 22:13:51 -07:00
SkyMarshal
61d21b3cab Added the ability for borgs to ude departmental radios 2011-12-08 22:02:46 -07:00
unknown
8f11c4acfb DO NOT USE. 2011-12-08 17:07:25 -07:00
SkyMarshal
3319b22adf Remove killbot ref. when you make an ED-209, reversed list order for QM requests and orders. 2011-12-08 15:08:03 -07:00
SkyMarshal
b5018a8aa3 Removed thermals from traitor objectives. 2011-12-08 14:29:21 -07:00
SkyMarshal
dafbfe6edd Replaced an accidentially blanked part of flavor text 2011-12-08 14:25:24 -07:00
SkyMarshal
009d0915bf Removed most other cyanide references. Remade cyanide pills into suicide pills (100 units of Toxin) 2011-12-08 14:22:45 -07:00
SkyMarshal
ff8ca07714 Removed accelerated shuttle launch. 2011-12-08 14:05:14 -07:00
SkyMarshal
6f88b4f981 Forgot to remove the entry from the table the random event switch looks at. 2011-12-08 13:57:26 -07:00
SkyMarshal
0da1bea7c0 Add BS12 Space Law, remove Gravitational Anomaly event 2011-12-08 13:51:10 -07:00
SkyMarshal
1f2a2ef68e Hopefully final fix 2011-12-08 13:36:09 -07:00
SkyMarshal
9ec39e9390 Replaced baystation.dme 2011-12-08 13:21:29 -07:00
SkyMarshal
7779a4c034 Fixed double derp. 2011-12-08 12:44:36 -07:00
SkyMarshal
2784d59c09 Fixed derp 2011-12-08 12:42:03 -07:00
SkyMarshal
d7eb6e4ae6 Remove Cyanide, add Sleepy Pen and Thermals to uplink, remove cloaker 2011-12-08 12:35:10 -07:00
Albert Iordache
dd6ddaa8c3 Revert "removed cloaker"
This reverts commit 1fa97843f8.
2011-12-08 15:28:35 +02:00
Albert Iordache
00e8e13d1e Merge pull request #76 from Tastyfish/master
The closet tg merge broke charge crates
2011-12-08 05:27:20 -08:00
Albert Iordache
fa2b3d8741 Merge pull request #79 from Uristqwerty/master
Fix for stealthed admin names appearing in the PM reply title.
2011-12-07 12:44:31 -08:00
Uristqwerty
74c2b7c55b Stealth PM fix: hide stealthmin names in the input box title. 2011-12-07 12:50:05 -05:00
Tastyfish
1fa97843f8 removed cloaker 2011-12-07 12:29:04 -05:00
Tastyfish
e51459600f Merge remote-tracking branch 'upstream/master' 2011-12-07 11:21:50 -05:00
Tastyfish
75fb55e3b9 merge 2011-12-07 11:21:17 -05:00
Albert Iordache
51a55e4f7c Merge pull request #78 from Strumpetplaya/master
Cloning fixed.
2011-12-07 03:07:35 -08:00
Albert Iordache
6a445ebd28 Merge pull request #73 from Abi79/master
Removed more fat code
2011-12-07 03:05:29 -08:00
StrumpetPlaya
79c84c9d23 Cloning fixed. 2011-12-07 05:40:33 -05:00
Tastyfish
38e01784b5 started on kitchen/bar 2011-12-07 02:24:51 -05:00
Tastyfish
455b61d9c8 hand labelers have been broken since the first commit.. 2011-12-07 00:32:02 -05:00
Tastyfish
625d0751ad fine barkeeps can have shotgun back 2011-12-06 21:06:02 -05:00
Tastyfish
14f0a4d0b9 UnRevert "the closet tg merge broke my charge crates"
This reverts commit 2694238e88.
2011-12-06 21:04:41 -05:00
Tastyfish
ecb6f2b2d6 Revert "the closet tg merge broke my charge crates"
This reverts commit 2694238e88.
2011-12-06 21:00:08 -05:00
Tastyfish
ac627aa521 Merge branch 'master' of github.com:Tastyfish/Baystation12 2011-12-06 20:36:20 -05:00
Tastyfish
2694238e88 the closet tg merge broke my charge crates 2011-12-06 20:35:07 -05:00
Tastyfish
4981fef920 NO SHOTGUN FOR BARTENDER 2011-12-06 16:32:15 -05:00
Albert Iordache
92045315a3 Merge pull request #72 from Strumpetplaya/master
Security now has maintenance access.
2011-12-06 09:46:00 -08:00
Albert Iordache
9dc2644e51 Commented out more of the fat code, for issue #71. 2011-12-06 19:23:25 +02:00
Albert Iordache
6a62c3b8ff Merge pull request #71 from SkyMarshal/master
Removed obesity upon overeating
2011-12-06 08:48:06 -08:00
Albert Iordache
bb9a5abb7f Merge pull request #70 from Tastyfish/master
SkyMarshal thingy's - everyone can be cult, paper label, also emote updates
2011-12-06 08:34:24 -08:00
StrumpetPlaya
508df5d3cb Nobody spawns with internals anymore. 2011-12-06 07:35:33 -05:00
StrumpetPlaya
4489db546d Added detective stuff - fibers.
Left out bloody footprints for now.  Not sure we want that with the
current system of corpses dropping blood spatters all around when dragged.
2011-12-06 07:12:19 -05:00
StrumpetPlaya
bbd04aa2aa Security now has maintenance access.
Security also has access to medical/research hallways.
Assistants no longer have maintenance access.
2011-12-06 06:04:34 -05:00
Albert Iordache
21afc5bebb Merge pull request #69 from Miniature/master
Turned on traitor scaling
2011-12-06 02:55:03 -08:00
SkyMarshal
68b1be773a Removed fatness from overeatting 2011-12-06 02:47:50 -07:00
Tastyfish
139252dbda made me accept v/h in form of "me v waves."/"me h shouts!", fixed v/h types of robot emotes, added *help for robots 2011-12-06 00:30:07 -05:00
Tastyfish
68c6b97fd3 everyone cult!, paper label 2011-12-05 23:19:39 -05:00
Miniature
5b3a73c5fe Merge branch 'master' of github.com:Baystation12/Baystation12 2011-12-06 14:42:49 +10:30
Miniature
7d751d8cd3 Turned on traitor scaling 2011-12-06 14:40:25 +10:30
Albert Iordache
95c099f0b8 Merge pull request #68 from Tastyfish/master
fixed Load Slot Close button
2011-12-05 13:46:35 -08:00
Tastyfish
571ee5f3de fixed Load Slot Close button 2011-12-05 14:33:18 -05:00
Albert Iordache
5eb693b0f7 Merge pull request #67 from Tastyfish/master
added login start area to antiqua.dmm at top-left of z-level 2 so map can be loaded
2011-12-05 01:02:13 -08:00
Tastyfish
97e917b657 Merge remote-tracking branch 'upstream/master' 2011-12-05 03:34:53 -05:00