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

9839 Commits

Author SHA1 Message Date
Vetinari
3c0a424bb3 Medbay Remap post-ERT 
Medbay Overhaul, mapping post-ERT changes, recommit of previous files
due to computer derp.
 2013-06-12 23:27:36 +10:00
Zuhayr
91008c4d38 Amending a previous fix due to new ERT code from bef. 2013-06-12 20:47:04 -07:00
Zuhayr
1c65f32828 Compile fix. 2013-06-12 20:37:45 -07:00
Zuhayr
b9be0158c7 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-06-12 20:31:52 -07:00
Zuhayr
fa79834e1b Merge resolution. 2013-06-12 20:31:29 -07:00
Zuhayr
48aa2bb8f9 Internal damage from yanking out things, damage from moving with shrapnel and things inside your body. 2013-06-12 14:17:05 -07:00
Zuhayr
6bd685bcb2 Compilation fix for ERT code. 2013-06-12 12:30:28 -07:00
Zuhayr
7cd54ac387 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 2013-06-12 11:41:08 -07:00
Chinsky
8c23dc60f7 Merge pull request #3046 from meyar/bleeding-edge-freeze 
Emergency Response Team Mega Update! Weee
 2013-06-12 03:21:42 -07:00
Zuhayr
19748b1217 Added verbs for ripping items out of yourself, added examine proc, altered hatchets w_class. 2013-06-12 03:20:23 -07:00
Segrain
81852bea51 Fix-O-Vein steps bugfix. 2013-06-12 14:00:48 +03:00
Zuhayr
b859a494e6 Minor surgery fix. 2013-06-12 01:57:01 -07:00
Zuhayr
7db6cd4108 Added shrapnel from projectile wounds and altered scanner readout. 2013-06-12 01:45:07 -07:00
Zuhayr
0a220db976 Added embedded weapons and adjusted implant removal surgery to work with non-implants in organs. 2013-06-12 00:28:12 -07:00
Kilakk
bde37882ce Fixed a small spelling error in job prefs 2013-06-11 21:36:40 -04:00
meyar
811fae38fd Missed a line 2013-06-11 16:58:48 -04:00
meyar
494887a9b5 Typo fix 2013-06-11 16:58:32 -04:00
meyar
1203a32bbe Typo fix 2013-06-11 16:58:13 -04:00
meyar
7256c9d39f Changes 'Emergency Rescue Team' to its proper 'Emergency Rescue Team' 2013-06-11 16:52:36 -04:00
Kilakk
6c8423aed0 Merge remote-tracking branch 'upstream/bleeding-edge-freeze' into bleeding-edge-freeze 2013-06-11 16:25:42 -04:00
Zuhayr
d0e15b3608 Harpoon, harpoon sprites, removed pneumatic cannon sprites from human.dmi. 2013-06-11 13:15:33 -07:00
Chinsky
fa2b46ce9c Merge pull request #3035 from CIB/feature 
New configuration option: external resource download
 2013-06-11 12:33:16 -07:00
Chinsky
3c56e6dacb Merge pull request #3043 from Baystation12/master 
Fix for pods
 2013-06-11 12:32:47 -07:00
Chinsky
e638540b4c Merge pull request #3041 from meyar/master 
Emergency map fix: Security escape pod
 2013-06-11 12:29:41 -07:00
cib
13b16bcd69 Added extra message when downloading external resources. 2013-06-11 21:28:59 +02:00
cib
4e0c68b88a Added a configuration option that allows putting the .rsc on external servers. 2013-06-11 21:28:59 +02:00
meyar
f03f8c9b66 Disables debug(poorly made debug) verb for ERT. This -may- be behind my BEF fix, but I suck at git and can't exclude this because I am dumb :c 2013-06-11 15:25:59 -04:00
Chinsky
bd3879da2e Merge pull request #3040 from Baystation12/master 
hurka durka master update
 2013-06-11 12:25:56 -07:00
Chinsky
09d0bb7f8e Merge pull request #3039 from Furlucis/master 
Typo fixes
 2013-06-11 12:21:16 -07:00
Zuhayr
c57f2bb137 Polished off some pneumatic cannon bugs. All done. 2013-06-11 12:19:20 -07:00
Spamcat
076f4c9d9a Figured I should finally commit it, since exams are over now~ 
Radios start off by default. Should decrease the amount of tcomm lag.
 2013-06-11 23:09:44 +04:00
Furlucis
360bde9f83 Fixed some typos. (feotal, "/red ...") 
Signed-off-by: Furlucis <Logman115@gmail.com>
 2013-06-11 15:01:48 -04:00
meyar
38feb46839 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-06-11 15:00:22 -04:00
Zuhayr
de2b8b8087 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-06-11 11:51:48 -07:00
Chinsky
8108dd6416 Merge pull request #2994 from Giacomand/AI_announcement_BEF 
AI voice announcement system. Type in words to create vocal sentences.
 2013-06-11 08:30:55 -07:00
Zuhayr
c8f2ee9326 Removed a debug string. 2013-06-11 01:35:30 -07:00
Zuhayr
045a90167c Vox sprite fixes. 2013-06-11 01:32:07 -07:00
Zuhayr
96d9a41ea7 Pneumatic cannon sprites, gas loss code. 2013-06-11 00:57:15 -07:00
Furlucis
a60dcf473b Fixed a runtime error where one thing would sometimes try to handle an empty list. Some chance that will still make a jungle map fail to work right, though. 
Signed-off-by: Furlucis <Logman115@gmail.com>
 2013-06-11 03:18:03 -04:00
Zuhayr
0fb234d6a4 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 2013-06-10 22:35:42 -07:00
Zuhayr
98d31e9191 Preliminary work for pneumatic cannons (WIP, no sprites, broken gun) 2013-06-10 22:35:01 -07:00
jack-fractal
e3fd232741 - removing yellow and black gloves from the randomized tech storage object 
- adding toolbelts
- rebuilding changes to map
 2013-06-11 00:52:32 -04:00
jack-fractal
245713418f Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 
Conflicts:
	maps/tgstation.2.1.0.0.1.dmm
 2013-06-11 00:29:10 -04:00
Chinsky
c906628349 Merge pull request #3031 from Baystation12/master 
Updating BEF with master
 2013-06-10 19:45:24 -07:00
SkyMarshal
1739ff6fec God, I am not awake. 2013-06-10 19:40:39 -07:00
SkyMarshal
df73aabf83 Fixes for ZAS issues. 
Fixes #2996
Fixes #3023
 2013-06-10 18:49:41 -07:00
Kilakk
333163dc01 Reconfigured the job prefs panel to look nicer 
Thanks Deccy for pointing out a one pixel difference
 2013-06-10 21:45:50 -04:00
Kilakk
32b0ad2dfa Adds "Xenobiologist" as its own separate job 2013-06-10 21:45:07 -04:00
Zuhayr
cbb36ce24f Added ability for tanks to be held on vox suits. 2013-06-10 18:08:25 -07:00
Zuhayr
630db203f9 Oxygen toxicity fix. Whoops. 2013-06-10 17:50:15 -07:00