cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,126 Commits 10 Branches 0 Tags
5628272bde0235f752765d64ea1462ed9f51a724
Commit Graph

2336 Commits

Author SHA1 Message Date
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
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
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
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
455b61d9c8 hand labelers have been broken since the first commit.. 2011-12-07 00:32: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
Miniature
af301633f6 Merge branch 'master' of git://github.com/Abi79/tgstation13-git 
Conflicts:
	baystation12.dme
	code/defines/obj/vending.dm
	code/game/machinery/vending.dm
	html/changelog.html
	maps/tgstation.2.0.8.dmm
 2011-12-07 07:53:20 +10:30
Miniature
5fec6c6319 DM why you so shit 2011-12-07 07:46:08 +10:30
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
uporotiy
df04d75c48 Aaaaaaaaaand once again I forget to upload a new file. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2629 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-06 15:04:11 +00:00
baloh.matevz@gmail.com
cb19629c18 Wrenches no longer spawn with a random pixel offset to the right. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2628 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-06 14:39:19 +00:00
cib
a6e7d09620 Moved the singularity and particle accelerator a bit out of the station. Added some stuff to engineering and generally organized it a bit. 2011-12-06 05:24:43 -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
SkyMarshal
68b1be773a Removed fatness from overeatting 2011-12-06 02:47:50 -07:00
uporotiy
4764cdc990 Aliens: 
Reworked the code to use a new "plasma" var instead of toxloss for their powers.
Facehuggers are now active for 30 to 60 instead of 3 to 5 seconds.
Aliens can see whether facehuggers are active without needing to examine them.
Changelings:
Ranged sting is now 2 squares-ranged instead of 3 squares.
Space:
Reverted the randomly accessible z-levels back to how they were (derelict and ai sat).

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2627 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-06 08:30:03 +00: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
kortgstation@gmail.com
07dac128c1 Gyrojet bolts now explode on contact with mobs and walls. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2626 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-06 04:50:42 +00:00
Tastyfish
68c6b97fd3 everyone cult!, paper label 2011-12-05 23:19:39 -05:00
ryantennessee@yahoo.com
1657e3a9dc Changing portable air pump volume from 750 to 2500 (3.33 x current). 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2625 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-06 01:28:28 +00:00
Tastyfish
571ee5f3de fixed Load Slot Close button 2011-12-05 14:33:18 -05:00
CompactNinja
dc3ada7c27 Merge pull request #66 from Miniature/master 
AI freelook stuff - should work perfectly now
 2011-12-04 21:45:13 -08:00
Miniature
a7b2110194 AI freelook stuff - should work perfectly now 
Urist said that /tg/ people got some runtime errors, I have no idea what they got and I haven't got any errors in testing so yeah.
 2011-12-05 15:08:52 +10:30
Miniature
80c40ada96 Merge pull request #65 from Tastyfish/master 
fixed my ooc color derp
 2011-12-04 20:06:59 -08:00
Tastyfish
99407ea862 fixed me ooc color derp 2011-12-04 23:00:16 -05:00
uhangi@gmail.com
414cfbe8c1 Uncommented erro's code, reticked erro's code. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2620 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-05 02:02:35 +00:00
uhangi@gmail.com
025288d4eb Commenting out erro's broken code until he fixes it so no compilation errors 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2619 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-05 01:48:48 +00:00
CompactNinja
cd6bdc968e Merge pull request #64 from Tastyfish/master 
let admins (space) change ooc color, fixed cryo in tgstation map post-merge
 2011-12-04 15:56:19 -08:00
Tastyfish
84b471361e let admins (space) change ooc color, fixed cryo in tgstation map post-base merge 2011-12-04 18:52:47 -05:00
headswe
ec2456a1f0 Merge pull request #60 from Tastyfish/master 
borgs go beep and janitor borgs can OCD, charge ordering bug fix, flavor text
 2011-12-04 15:31:07 -08:00
uhangi@gmail.com
44c0cfc46d -Adding pepper spray for security officers. 
-Fixed a storage bug for chemsprayers and space cleaner

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2618 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-04 22:42:18 +00:00
n3ophyt3
e4afa60af2 Accidentally removed a line when I was fixing gun recharge rates. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2616 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-04 21:40:31 +00:00