cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 20:23:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,775 Commits 8 Branches 0 Tags
a765ad44e451db1ea55e47f05e63ab3d16c754ad
Commit Graph

2209 Commits

Author SHA1 Message Date
cib
636b2d573a Lack of blood_DNA will no longer lead to all blood mysteriously evaporating. 2012-05-24 10:44:04 +02:00
cib
4b78746f59 Updated changelog. 2012-05-23 21:25:22 +02:00
cib
a72ef83e79 Worked on bleeding and human life. 
- Fixed a bug where a mob would keep bleeding out due to having lost blood.
- Cleaned up some code.
- Moved some organ and bloodloss stuff into separate functions.
 2012-05-23 21:12:25 +02:00
cib
81d3e6bed4 Added Appel's hunger messages. More Cleanup. 2012-05-23 20:10:51 +02:00
cib
6c8ed5c0bc Added the necessary check to blood regeneration. 2012-05-23 19:44:37 +02:00
cib
e1355be043 Fixed the dumbest way to find a rune in src.loc ever. 2012-05-23 19:00:57 +02:00
cib
901dc8a0a8 Cleanup of code/modules/mob/living/carbon/human/life.dm 
- Added comments to handle_regular_hud_updates()
- Removed redundant code and commented code
- Made a dedicated mob/living/carbon/human/proc/vomit(), which can be called from other places now, such as *emote
 2012-05-23 18:32:12 +02:00
Mloc
c1a90c1b7a Merge pull request #1142 from Erthilo/master 
Fixes Tajaran spawning as humans with furry bits. Fixes cyborgs using recharges. Fixes medical messages.
 2012-05-23 07:50:00 -07:00
Mloc
b89e45c27b Merge pull request #1143 from CIB/master 
HUD fix
 2012-05-23 07:49:08 -07:00
cib
6d5521625d The HUD crit display now updates properly(crit is when your heart stops beating, not when you collapse due to trauma). 2012-05-23 16:44:57 +02:00
Erthilo
5c3cdda40f Fixes Tajaran spawning as humans with furry bits. Fixes cyborgs using recharges. Fixes medical messages. 2012-05-23 15:21:54 +01:00
Mloc
f1d8922248 Merge pull request #1135 from Erthilo/master 
Removed blood regen due to errors, bug fixing, adds a way to temporarily allow people Taj/Sog, custom items, changelog credits list!
 2012-05-23 03:47:45 -07:00
Erthilo
3fcd1f68f7 Comments out blood regen due to runtimes. Fixed some problems with sleeping and resting and chloral (does not actually increase sleeping times!). Adds some messages for sleeping. 2012-05-23 02:14:35 +01:00
Erthilo
57f1c15f15 Adds feedback for temp whitelisting, added some people to the alien whitelist, update changelog with credits list! 2012-05-22 23:43:15 +01:00
Erthilo
8f74aa23b5 Added shotgun in-hand sprites. 2012-05-22 23:37:56 +01:00
Erthilo
371a9a91c0 Adds whitewolf41's custom item. Also updates Deus's hat sprite. 2012-05-22 22:15:26 +01:00
Erthilo
8131287d03 Hopefully fixes the handle_regular_status_updates runtime. Also adds option for admins to allow Taj/Sog for a round on the player panel. This needs to be done before spawning! 2012-05-22 22:14:47 +01:00
Lexus Langg
47cc90ca1a Added empty lockboxes and secure briefcases to the R&D Designs. 
Was suggested here: http://baystation12.net/forums/index.php/topic,3287.msg84734.html#msg84734
Signed-off-by: Lexus Langg <jaedonjacobi@yahoo.com>
 2012-05-22 12:32:07 -07:00
Lexus Langg
ab92639ef4 Changed my custom item's sprites. 
I made a new mob sprite for my clipboard, and changed the flask to Kirby's sprite.
Signed-off-by: Lexus Langg <jaedonjacobi@yahoo.com>
 2012-05-22 09:47:35 -07:00
cib
615871b0ce Merge github.com:Baystation12/Baystation12 
Conflicts:
	html/changelog.html
 2012-05-22 14:50:00 +02:00
cib
79e2cdef86 Updated changelog. Added some bug info to places in the code. 2012-05-22 14:29:01 +02:00
cib
fda676435e Added a specific sleep message, memes now see their points on the status screen, admin-adding a meme now adds them to the meme list. 2012-05-22 13:55:00 +02:00
cib
d887d8ae41 Fixed a few issues with the meme admin stuff. 2012-05-22 13:13:01 +02:00
cib
56b178f396 Implemented #1107. 2012-05-22 11:24:42 +02:00
Erthilo
edb09ea6d7 Fixes double barrel shotgun not working with the gun system. 2012-05-22 00:39:57 +01:00
Erthilo
b7b33fc91a /obj/item/weapon/spacecash change to /obj/item/weapon/money 
Can now split and stack money properly.

Fixes genetics/research access door and also money path changes.
 2012-05-21 23:56:48 +01:00
Erthilo
36b0ba73cd Fixes Particle Accelerator admin logging. 2012-05-21 23:55:00 +01:00
Erthilo
262890f593 Fixes armored trenchcoat name. Now that's minor! 2012-05-21 23:53:05 +01:00
Erthilo
c9bfde5d7a Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates 
Conflicts:
	html/changelog.html
 2012-05-21 21:13:32 +01:00
Erthilo
dd5ed6a1cd Adds a sounds for implant removal, and better messages for the rag. 2012-05-21 21:02:01 +01:00
Erthilo
4114e246ee Merge fixes, and spelling corrections. 2012-05-21 20:47:55 +01:00
Erthilo
7fd99c7d3a TG: -Bunch of new/updated locker sprites. Most noticeable in mining and engineering 
-New wardrobe closets for several departments
Revision: r3633
Author: 	 ericgfw...@hotmail.com
 2012-05-21 20:40:08 +01:00
Erthilo
89aa2d0a90 TG: - Fixed some odd behavior with storage items when you drag-dropped them from the 
floor without ever picking them up.
- New hotkeys: Delete is the 'stop dragging' button and insert cycles through
intents.
- Added some user feedback messages to the drop, throw, stop-dragging and cycle-
intents hotkeys.
- Added the hotkeys thing to the changelog.
Revision: r3631
Author: 	 baloh.matevz
 2012-05-21 20:31:53 +01:00
Erthilo
c84aa96cc4 TG: The new 'sleek' user interface is going live. 
OLD screenshots (Actual hud uses black/orange scheme):
Humans:
http://www.kamletos.si/ss13%20hud%2018%20human%20standard.png
http://www.kamletos.si/ss13%20hud%2018%20human%20full.png

Borgs:
http://www.kamletos.si/ss13%20hud%2018%20borg.png

Aliens:
http://www.kamletos.si/ss13%20hud%2018%20larva.png
http://www.kamletos.si/ss13%20hud%2018%20alien.png

Monkeys:
http://www.kamletos.si/ss13%20hud%2018%20monkey.png
Revision: r3630
Author: 	 baloh.matevz
 2012-05-21 20:29:35 +01:00
Erthilo
911cd7fca7 TG: -Added some positive reagents to certain foods. 
Revision: r3627
Author: 	 d_h2...@yahoo.com
 2012-05-21 17:13:29 +01:00
Erthilo
4bda83ec51 Implant removal surgery. Scalpel > Hemostat > Restractor > Hemostat (Multiple times may be needed). For now syndicate implants simply disintegrate. Other implants can be put back into an implanter. 
Also allows rag to hold 5 reagents, smother people with it, and also stops it causing attack messages.
 2012-05-21 15:13:15 +01:00
Erthilo
3c1d50232a Fixes workaround if someone has a savefile and is taken off the alien whitelist. 2012-05-21 14:23:32 +01:00
Erthilo
d8a2e17f3a Hotfix for Tajarans. Reverts tajaran.dm. Guess blend doesn't work there. Also prevent skin change workaround. 2012-05-21 12:31:33 +01:00
caelaislinn
b626812c83 Merge branch 'master' of https://github.com/Baystation12/Baystation12 
Conflicts:
	code/game/machinery/computer/lockdown.dm

Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
 2012-05-21 17:48:12 +10:00
Erthilo
eb599dd33a Merge pull request #1119 from SkyMarshal/BugFixes 
Bug fixes
 2012-05-20 14:42:30 -07:00
SkyMarshal
58570a0f65 As many bugfixes as I could cram into here. 2012-05-20 14:23:10 -07:00
SkyMarshal
c8faf93e9f More Tajaran fixes, made blood-type damage not affect changelings, blood now regenerates. 2012-05-20 13:38:20 -07:00
Erthilo
f81b043787 Fixes for forcing no hair/face hair. Shuffles checks around for Pick Up Verb. 2012-05-20 21:37:10 +01:00
Erthilo
56db1fdff8 Adds Soghun/Tajaran whitelisting. Stick key and race into alienwhitelist.txt like so 'byondguy - Soghun' to allow soghun, etc. 2012-05-20 20:51:38 +01:00
Erthilo
f20e61b4ae Merge branch 'master' of github.com:Baystation12/Baystation12 2012-05-20 20:33:44 +01:00
Erthilo
56203680d9 Missed a list of AI verbs. Engineering jumpsuit whitespace eliminated. Half fixes holopads. You can use them, you can't move. Nutriment made less ridiculously healing. Player Mute OOC name change to be more clear. More AI camera fix. Small Tajaran examine text fix. 2012-05-20 20:09:23 +01:00
caelaislinn
aa67c605dc fixed lockdown computer. 
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
 2012-05-21 02:11:47 +10:00
caelaislinn
da65f852b6 - power monitor: a remote monitoring device to send network data to a console 
- lowered the number of radsuits per crate down to 1 (they're never used on exodus anyway)
- tweaked turbines

Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
 2012-05-20 22:18:26 +10:00
Erthilo
2ce24412ed Lot's of grammar and spelling fixes for APC actions. 2012-05-20 00:55:38 +01:00
Erthilo
9d6eb534a7 Adds confirmation to Delete Character Slot. 2012-05-19 23:01:56 +01:00