cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 19:22:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,253 Commits 9 Branches 0 Tags
314911e458d35df55d1782ebf4efbc996887d726
Commit Graph

841 Commits

Author SHA1 Message Date
comma
5ad05105f4 Small bugfix to ashtrays and cig butts 
Now can throw out ashtray shards. 'ciguarete butt butt' should not appear anymore.
Also glass ashtray now shatters with sound
 2012-03-04 06:45:14 +02:00
SkyMarshal
4d7cfb5e34 Another mapupdate, de-nerfed blob, readded the missing Tajaran speak. 2012-03-03 21:08:49 -07:00
comma
ef6473b964 Merge branch 'master' of https://github.com/Baystation12/Baystation12 
Now working
And without promoting myself as Game Master :P

Signed-off-by: comma <krauchinsky@gmail.com>
 2012-03-03 03:16:30 +02:00
comma
ee09389f5b Merge branch 'master' of https://github.com/Baystation12/Baystation12 
Conflicts:
	baystation12.dme
 2012-03-02 22:04:20 +02:00
comma
2edd73627d Added ashtrays 
Breakable. Spill contents on breaking or hitting the solid stuff after being thrown.
Have limited capacity. Can be emptied in disposal outlet.
Change sprite when are half-filled and filled.
Also fiddled a bit with the cigs code, so you can put them out without dropping.
 2012-03-02 21:56:08 +02:00
SkyMarshal
eab449cbbb Added a "Deadman's switch" (Not really) to the signaler, shooting while standing off makes the other guy shoot, balanced stunning, added a time limit to switching hostage modes. 
Signalers: Right click verb makes you ready to signal it, being shot with it in your active hand has a 80% chance to trigger it, dropping it has a 5% chance.
Stunning always stuns you SOME, but armor can now lessen it (It used to be possible to not get stunned at all by being shot normally)
Shooting during a mexican standoff now makes the other guy shoot you too.
Added a time to how quickly you can adjust hostage things.  1.5 seconds per thing.
 2012-03-02 09:41:03 -07:00
SkyMarshal
0d8c7d5e51 Reworked the gun system to handle hostage scenarios better. 
Ported and adjusted with permission from Lost Worlds.
 2012-03-01 19:20:39 -07:00
Miniature
03a40195b1 Merge branch 'master' of github.com:Baystation12/Baystation12 
Conflicts:
	baystation12.dme
 2012-03-01 19:17:38 +10:30
Miniature
6e453e0aa1 Housekeeping with custom items 2012-03-01 19:10:52 +10:30
SkyMarshal
67502c5d2e Bugfixes for Hallucinations, borgs'n'doors, and airlocks autorefreshing. 2012-02-29 22:21:01 -07:00
SkyMarshal
2b3fbc5047 Merge pull request #566 from Erthilo/master 
Added Notebook for the Detective
 2012-02-29 16:59:35 -08:00
Ren Erthilo
cf2b6ec28c Added Notebook for the Detective. 2012-03-01 00:23:29 +00:00
Tastyfish
1724038ce9 Merge remote-tracking branch 'upstream/master' 2012-02-29 18:50:17 -05:00
musketstgstation@gmail.com
ddc7f45a13 Integrated BS12's improved uplink code, courtesy of SkyMarshal. 
This means items now spawn in your hand if possible, items are sorted into categories, and only items you have enough telecrystals to purchase will be displayed.  Also, the same basic code is now used for PDA, headset and nuke-round uplinks, and it should be easier to add new items.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3216 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-02-29 22:50:14 +00:00
SkyMarshal
3a14201f37 Bugfixes for PDA manifest and bloody Tarjans 2012-02-29 14:05:36 -07:00
Tastyfish
4dfa623b4a copy flavor text over for tajara transformation 2012-02-29 13:54:27 -05:00
Miniature
a93c13640a Merge pull request #553 from Miniature/master 
runtime fixes
 2012-02-28 19:02:37 -08:00
Miniature
5783eb88dd disease splicer runtime fix 2012-02-29 13:23:26 +10:30
Tastyfish
70ac1a80b9 removed some redundant code, disabled hair on tajarans 2012-02-28 18:39:47 -05:00
CIB
e30ad74ff5 Merge pull request #546 from SkyMarshal/master 
Nuke upgrade, admin player panel update, disposal and teleporter features.
 2012-02-28 12:45:08 -08:00
SkyMarshal
02002054de Teleporter has a cancel button. 
Improved the admin player panel.
Disposals now work right with things thrown at them.
Nuke upgraded to use realtime.
 2012-02-28 13:39:51 -07:00
CIB
27fd036c87 Merge pull request #539 from SkyMarshal/master 
Fixed lasers, balanced nuke, removed stupid code, removed Karma, improved admin panel.
 2012-02-28 00:44:06 -08:00
SkyMarshal
b653c615be Replaced a lot of stupid from the wardrobes and package wrap, they now use an afterattack call instead of specific code for them in EVERY OTHER ITEM. 
Improved the admin panel.
Removed Karma.
 2012-02-28 00:11:15 -07:00
Tastyfish
c978c95d29 adding admin verb to transform person into tajara, fixed tajara body updates 2012-02-28 00:27:37 -05:00
SkyMarshal
f64dcf2e31 Added a missing icon, fixed a wardrobe/evidence bag interaction bug, fixed a nuke radio bug, added another update_clothing() call. 2012-02-27 11:09:07 -07:00
SkyMarshal
c7af63b281 Energy projectiles now move instantly, leaving a straight line from their origin to their destination, like real energy weapons. 
Welderbackpack now has a proper icon.
Stun rounds can now be reduced or blocked by armor
Added more update_clothing() calls
Fixed strangling non-humans.
Blob is now an announcement only.
 2012-02-26 23:06:43 -07:00
Apple_Master
cbaea87dc7 Merge branch 'master' of github.com:Baystation12/Baystation12 
Conflicts:
	baystation12.dme
 2012-02-25 18:02:57 +00:00
Apple_Master
35dfb4a7ed Added Artifact #1 
Signed-off-by: Apple_Master <cheeckan@ymail.com>
 2012-02-24 16:07:35 +00:00
SkyMarshal
99aa041f11 Fixed some bugs, map update for Antiqua.dmm 2012-02-23 00:13:34 -07:00
Apple_Master
9b22db4160 Thus begins the chronicle of Apples, CODER. 
Signed-off-by: Apple_Master <cheeckan@ymail.com>
 2012-02-21 21:52:11 +00:00
SkyMarshal
37f39de861 CentCom doors are less hackable. 
Clamped values on the regeneration superpower
Moved detective work to a modules subfolder
 2012-02-19 21:09:11 -07:00
cib
7fd3c5a4c4 Changes to vira and health scanner. 
- Antibodies now immunize you once they fight off a disease.
- The pathogenic isolator now displays whether blood is infected.
- Antibodies now work on monkeys.
- Syringes now extract reagents other than blood from humans, too.
- Separated the health scanning proc from the health scanner, so that it can later be re-used in the PDA.
- Health-scanners now display hints of whether someone may be infected.
 2012-02-19 17:28:54 +02:00
petethegoat@gmail.com
e0230b2ff0 Commented out buildmode until it can be fixed. 
More sanity checks for DNA modification.
Updated the metal, plasteel, glass and r-glass sprites. They're a lot smaller now.
Removed that stupid knife zippo sprite.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3145 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-02-18 16:27:08 +00:00
SkyMarshal
6e7dfc4ca6 More fixes 2012-02-18 01:53:26 -07:00
SkyMarshal
13769c5325 GODDAMN WHOEVER MAPPED THAT 
Also: Added dossier removal to detective comp
Removed extraneous quotes from radio alerts
Altered command channel.
 2012-02-18 00:12:31 -07:00
SkyMarshal
b0eebb2edb Reverted some layer adjustments I did that seem to have broken things, bugfixes for operating tables, choking people, and CPR, giving. Also added sterile mask box sprite, and tossed the singularity crap into a spawn(0) to try and reduce lag. 2012-02-17 12:56:46 -07:00
Albert Iordache
cc6c63edd7 Merge pull request #423 from caelaislinn/master 
added a couple of new clothing items, updated some sprites
 2012-02-16 08:29:15 -08:00
CaelAislinn
95b521dede Merge branch 'master' of git://github.com/Baystation12/Baystation12 2012-02-15 07:04:43 +10:00
CaelAislinn
9d798d3f95 updated some sprites, added new clothing 
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-02-15 06:58:50 +10:00
Tastyfish
badb7bd93f Merge remote-tracking branch 'upstream/master' 2012-02-14 12:01:14 -05:00
Tastyfish
12d119c109 porting old food stuff 2012-02-14 11:59:16 -05:00
Albert Iordache
aa04eed7e8 Merge pull request #417 from SkyMarshal/master 
Should reduce lag, mobs no longer update icons ever tick.
 2012-02-14 04:20:00 -08:00
SkyMarshal
f59fb6af94 More updates, added comfy chairs. 2012-02-13 23:28:12 -07:00
SkyMarshal
0fe42327a5 This should hopefully reduce processing requirements, by not rebuilding icons every tick. 
(Ported oldcode, all props to Strumpetplaya)
 2012-02-13 21:54:22 -07:00
Mloc
b690b1386f Hotkeys here! Adds alt-click (pull object), ctrl-Q and ctrl-E (cycle backwards and forwards through the intents). 
Signed-off-by: Mloc <colmohici@gmail.com>
 2012-02-13 20:18:17 +00: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
Albert Iordache
13ca13558f Merge pull request #391 from SkyMarshal/master 
Cleaned up fingerprint code.
 2012-02-09 09:58:34 -08:00
SkyMarshal
8b62eff01a Cleaned up the fingerprint code 
Added sanity checks to the clean blood proc.
 2012-02-09 09:42:08 -07: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
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