cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 11:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,860 Commits 5 Branches 0 Tags
c2e4a6420160e08089b27e0fad5a7d3b42a075d3
Commit Graph

2876 Commits

Author SHA1 Message Date
SkyMarshal
c2e4a64201 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-02-12 12:48:16 -07:00
SkyMarshal
3d284270f7 Fix for command reports and hacktools. 2012-02-12 12:47:36 -07:00
Albert Iordache
844ebef867 Merge pull request #403 from Tastyfish/master 
can eat normally with fork, med console upgrade
 2012-02-12 10:54:07 -08:00
Albert Iordache
c0ba7f227d Fixed cloning-related runtime error. 2012-02-12 19:58:24 +02:00
Tastyfish
0dc9bc325b upgraded medical console to be like sec console 2012-02-12 09:55:02 -05:00
Tastyfish
aeafc2ffa5 can eat all foods with fork like a sane person now 2012-02-12 07:07:16 -05:00
Tastyfish
b0815b8e1d Merge pull request #402 from CIB/master 
Space carp fixes
 2012-02-12 02:54:35 -08:00
cib
36801aecec mend 2012-02-12 11:51:00 +01:00
cib
d21de6271c Space carp and other critter balancing. 
They're less likely to attack and move slower now.
 2012-02-12 11:48:15 +01:00
Tastyfish
bf502d4dd4 forgot to push this file with job updates, gives doc virology access 2012-02-12 04:25:01 -05:00
Tastyfish
9ccc91f3ae Merge pull request #396 from Abi79/master 
Skipping computer ID checks for bans
 2012-02-10 15:15:58 -08:00
SkyMarshal
80eae068fd Merge pull request #400 from Tastyfish/master 
rejuvinate resets body temp, stabilize atmos restabilizes a chosen area
 2012-02-10 15:15:21 -08:00
Albert Iordache
a6f89fefee Merge pull request #398 from caelaislinn/master 
new custom items
 2012-02-10 14:32:38 -08:00
Tastyfish
41ab9956d3 Merge remote-tracking branch 'upstream/master' 2012-02-10 17:16:09 -05:00
Tastyfish
bc2817a0a4 rejuvinate resets body temp, stabilize atmos restabilizes a chosen area's atmos 2012-02-10 17:15:50 -05:00
CaelAislinn
0edd231592 added new custom items 
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-02-11 07:24:50 +10:00
Head
bff5a0fecc Added new shortcut for examine (ctrl + left click). 2012-02-10 20:36:55 +01:00
Albert Iordache
a28ade459a Small fix. 2012-02-10 21:09:34 +02:00
Albert Iordache
1f1ea35a75 Added a way to skip the computer ID check for bans, and cleaned up the code a bit 2012-02-10 21:01:20 +02:00
Tastyfish
bd6fbb5fe8 fix to sky's reagent effects changes 2012-02-10 00:07:29 -05:00
Tastyfish
1332516180 Merge remote-tracking branch 'upstream/master' 2012-02-09 23:59:30 -05:00
SkyMarshal
1d29574bc3 Part 2 of the WIP chemistry stuff 
Map update with secure doors!
 2012-02-09 21:50:50 -07:00
Tastyfish
e922a7fadb bugfix: wall not hiding level 1 pipes 2012-02-09 23:31:04 -05:00
SkyMarshal
c38d7d1d8f Merge branch 'master' of github.com:Baystation12/Baystation12 2012-02-09 16:36:17 -07:00
SkyMarshal
638c46b896 Merge pull request #393 from caelaislinn/master 
missing files
 2012-02-09 15:35:48 -08:00
CaelAislinn
4021891986 missing files 
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-02-10 09:33:48 +10:00
SkyMarshal
90d47bccf9 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-02-09 16:29:31 -07:00
SkyMarshal
48453a3592 WIP work in making welding fuel not retarded 
Chem grenades are now awesome again.
 2012-02-09 16:29:06 -07:00
CIB
03aea121d8 Merge pull request #384 from caelaislinn/master 
department lockers, other stuff
 2012-02-09 15:23:55 -08:00
CaelAislinn
03f970de65 Merge branch 'master' of git://github.com/Baystation12/Baystation12 
Conflicts:
	code/game/objects/closets/secure/engineering.dm
	maps/tgstation.2.0.8.dmm

Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-02-10 09:11:08 +10:00
SkyMarshal
90affc2bfc Merge pull request #392 from CIB/master 
Fixes to shock-crit and co
 2012-02-09 14:45:47 -08:00
nemo
f0e221a1ab Increased the speed at which you lose damage in shock-crit greatly, and the speed at which you heal in non-crit slightly. 2012-02-09 23:34:19 +01:00
Albert Iordache
13ca13558f Merge pull request #391 from SkyMarshal/master 
Cleaned up fingerprint code.
 2012-02-09 09:58:34 -08:00
SkyMarshal
463d078cd4 Added chemistry's big beakers to the supply pack. 
Security vending machines now have Evidence Bag boxes.
 2012-02-09 10:53:09 -07:00
SkyMarshal
8b62eff01a Cleaned up the fingerprint code 
Added sanity checks to the clean blood proc.
 2012-02-09 09:42:08 -07:00
Tastyfish
92dc961c10 disable meteors for now, until atmos fixed 2012-02-09 01:29:21 -05:00
Tastyfish
8eef84095b Merge pull request #389 from Tastyfish/master 
oops, left in a debug output
 2012-02-08 21:18:50 -08:00
Tastyfish
a7fcef6d45 oops, left in debug code 2012-02-09 00:17:54 -05:00
SkyMarshal
e4d4173b97 Merge pull request #388 from Tastyfish/master 
job title choices! lizards speak normal, can pour things down sink
 2012-02-08 18:17:30 -08:00
Tastyfish
2dc3a5cc6e fixed horribly buggy camera assembly 2012-02-08 20:56:04 -05:00
Tastyfish
0ebbe456b3 job titles 2012-02-08 20:43:04 -05:00
SkyMarshal
710bcbb42b Final parts for the airlocks. 
Wrench -> Weld -> Wrench removes the cover
secure/centcom has all wires electrocute
Emag is now tweaked
Implanted uplink now works.
 2012-02-08 17:42:34 -07:00
Tastyfish
8b4c314fa4 fixed livestock bugs 
other livestock commit whoops
 2012-02-08 19:17:08 -05:00
Tastyfish
7b0a083a68 merge form upstream/master 2012-02-08 18:45:25 -05:00
Tastyfish
91635c4fbd Merge remote-tracking branch 'upstream/master' 2012-02-08 18:42:00 -05:00
SkyMarshal
bd756112a1 There. That /should/ make it work. 2012-02-08 14:18:49 -07:00
SkyMarshal
6f149af6ba *sigh* Lets hope that worked. 2012-02-08 13:48:34 -07:00
SkyMarshal
b967f6b577 Should make the engineer hacktool auto raise the bolts, at the cost of alerting the AI. 2012-02-08 13:46:10 -07:00
SkyMarshal
7298e8619b Adding in cut down hacktool for CE. 2012-02-08 13:33:55 -07:00
SkyMarshal
1e3f332efa Merge branch 'master' of github.com:Baystation12/Baystation12 
Conflicts:
	code/defines/obj/weapon.dm

Corrected a messed up type path for the security doors.
 2012-02-08 12:13:03 -07:00