cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 20:52:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,436 Commits 6 Branches 0 Tags
0cfaf8e70b51b46b15e82a3839ee0c7400bb6537
Commit Graph

5688 Commits

Author SHA1 Message Date
Cael_Aislinn
00c915b16a fixed size of 5/6 picks, fixed some of the field types for suspension gens 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-18 11:53:55 +10:00
Cael_Aislinn
e2058e57a4 added a new manual explaining suspension, tweaked a manual 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-18 11:52:07 +10:00
Cael_Aislinn
dc017d6cce Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-03-18 01:08:45 +10:00
Chinsky
bc69115b8f Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-03-16 21:13:49 +04:00
Chinsky
76ecf647d7 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-03-16 21:06:57 +04:00
cib
57955dbf6a Fixed toxloss messages. 
Also added anti-spam checks to custom_pain
 2013-03-16 15:48:50 +01:00
Christian Bielert
14a96f77ab Merge pull request #2539 from comma/organ 
Organ code restructuring
 2013-03-16 07:10:40 -07:00
Chinsky
b5e7f7d204 Running around with fractures would damage internal organs inside of fractured areas. 2013-03-16 15:47:46 +04:00
Cael_Aislinn
38d30122e2 re-add holy water reagent 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-16 20:38:01 +10:00
Chinsky
97b126b8ab Merge pull request #2516 from caelaislinn/xenoarch 
Xenoarchaeology Update
 2013-03-16 03:10:16 -07:00
Chinsky
8ec33904dc Moved ruptured lung effects into lung processing 2013-03-15 18:28:44 +04:00
Cael_Aislinn
435ceda41f Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into xenoarch 
Conflicts:
	maps/tgstation.2.1.0.0.1.dmm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-15 20:37:35 +10:00
Cael_Aislinn
74d0608278 made research shuttle consoles buildable, removed a debug thing for analysis machines 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-15 20:06:22 +10:00
Cael_Aislinn
1b0c83cb76 renamed a bunch of areas, naming tweaks elsewhere, added some custom mapplaced obj definitions 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-15 20:05:27 +10:00
cib
cbc019d279 No more burning your hands off on 200C lightbulbs. 2013-03-15 00:53:50 +01:00
Chinsky
bf68f83546 Fixed brain surgery datum having duplicate class name. 
Made brain surgery into two steps, hemostat-fixovein.
 2013-03-15 00:32:27 +04:00
Chinsky
38a8246994 Moved code for injecting and taking blood to separate procs. 
Removed special case for blood from regent transferring proc.
Fixed humans spawning as limbles torsos.
 2013-03-14 20:18:37 +04:00
Cael_Aislinn
d8fbd0b2cc tweaked some names 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-15 01:09:02 +10:00
Cael_Aislinn
3c745a1ee2 added some storage boxes + gearbelt 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-15 01:03:01 +10:00
Cael_Aislinn
bf216021fc added/cleaned up research outpost areas (inc iconstates), moved area definitions to separate file 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-15 01:02:23 +10:00
Chinsky
13b6b2f61b Moved organ and blood code to module folder. 
Moved most organ and blood procs to that folder.
Refactored handle_organs a little.
Added comments in some places.
 2013-03-14 11:52:53 +04:00
Chinsky
1486e4b487 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into HTML 2013-03-14 05:06:55 +04:00
Chinsky
f2f042c904 Merge branch 'surgery' into bleeding-edge-freeze 2013-03-14 05:06:02 +04:00
Chinsky
7ac3f65f1a Merge branch 'nanopaste' into bleeding-edge-freeze 2013-03-14 05:05:43 +04:00
Chinsky
f8ae612991 Open incisions in surgery now bleed until closed or clamped. 2013-03-14 04:23:07 +04:00
Chinsky
b906a22192 Syndicate? Whozzat? 2013-03-13 06:38:32 +04:00
Chinsky
a2e2c373ef Added new item - nanopaste. 
Researchable by RnD (materials and engineering tech), used to repair robots and robolimbs more efficiently (twice as fast and both damage types at once).
 2013-03-13 05:57:53 +04:00
Chinsky
564e6b2f9b Merge branch 'gun' into bleeding-edge-freeze 2013-03-12 08:46:07 +04:00
Chinsky
c351bc1a33 Getting hit by bullet will shake camera. 2013-03-12 08:43:42 +04:00
Chinsky
a4581cc1d8 Derp, accidentally deleted OD for chloral way back. 
( c4997a34f1 )
Fixed now.
 2013-03-12 08:40:47 +04:00
Chinsky
f13cca99e6 Added brain fixing surgery. 2013-03-12 02:22:46 +04:00
Chinsky
2d8b280d99 Reverted changes to RIG armor values 2013-03-12 01:46:34 +04:00
Chinsky
b1bb564168 Fixed issue with #2154 
Also moved selection of base icon for limbs to update_mutantrace so it's only doen when race is changed.
Changed mob icons a little, to get rid of rogue red pixel on torso that was not covered by arm
Moved awkward red spot where missing hand would be to arm sprite, since missing whole arm would still make stump appear there, and it looks weird.
 2013-03-12 00:41:37 +04:00
Chinsky
7e82d9064c Head blows now can cause brain damage. 2013-03-11 04:59:24 +04:00
Chinsky
52ad4929d1 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-03-11 01:18:43 +04:00
Chinsky
b207349c44 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-03-11 01:18:10 +04:00
Chinsky
ced88e1569 Ported HUD functionality. 
Sec HUDs showing brief of sec record.
Med HUDs changing status and showing brief of med record.
 2013-03-11 01:11:56 +04:00
Chinsky
611bd1c6e9 Removed ability to use radio while stunned again. 2013-03-11 00:38:16 +04:00
Chinsky
e60bef91bd Added indication for when someone speaks into radio. 2013-03-11 00:27:18 +04:00
Cael_Aislinn
a1adddbce2 compile fix 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-11 00:12:33 +10:00
Cael_Aislinn
1322ac469c removed rock spawn for ordinary miners 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-10 23:49:50 +10:00
Cael_Aislinn
32184d8419 shuffled some sprites around, cleaned up some vars, added a new sprite for hyperspectral imager based on the book scanner 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-10 23:25:05 +10:00
Cael_Aislinn
f8f9397636 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into xenoarch 
Conflicts:
	icons/obj/library.dmi
	icons/obj/storage.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-10 23:01:33 +10:00
Cael_Aislinn
4559bcce57 tewaked the noticeboard memos a bit, added 5 (verbose) manuals explaining how to do xenoarchaeology in character, added a bookcase for the manuals 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-10 22:57:08 +10:00
Christian Bielert
10c3beae24 Merge pull request #2514 from comma/master 
Goatee fix.
 2013-03-10 05:01:50 -07:00
Chinsky
cf423fe979 Fixed Goatee and Male Skrell Tentacles. 2013-03-10 15:37:33 +04:00
Cael_Aislinn
2401ac8185 more renames 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-10 19:06:29 +10:00
Cael_Aislinn
c79b0c1672 moved and renamed a bunch of files to be more consistent + intuitive 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-10 19:00:05 +10:00
Cael_Aislinn
67ecee35df renamed scanner to be more consistent, fixed a couple of issues with the anodevice local feedback on activate 2013-03-10 18:51:15 +10:00
Cael_Aislinn
2ef841da6e overhaul/cleanup to ano utilizers: they're now consistent with modern ss13 interactions + process more cleanly and operate more robustly, they properly interact with the rest of the updated xenoarch content, activating them should also give a message to anyone watching 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-10 18:43:41 +10:00