cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,788 Commits 10 Branches 0 Tags
a9c76bb495878ac83414ed6883a25af4ceb8466d
Commit Graph

4365 Commits

Author SHA1 Message Date
SkyMarshal
a9c76bb495 Merge pull request #1152 from Erthilo/master 
TG Updates + HUD Updates + Alien Whitelisting
 2012-05-23 16:21:41 -07:00
Erthilo
1454dd92dd Merge branch 'master' of github.com:Baystation12/Baystation12 
Conflicts:
	html/changelog.html
 2012-05-23 23:13:12 +01:00
cib
8f093dea2f Fix issue #1001 Epidemic doesn't end properly 2012-05-24 00:08:22 +02:00
Erthilo
a4686e9cff HUD Update 
TG: - User interface updates.
Revision: r3646
Author: 	 baloh.matevz

TG: - Added a character setup option which allows you to pick between the Midnight,
Orange and Old icon sets for the user interface.
- Deleted most of the unneeded icons from screen1_Midnight.dmi Use that as the
reference for making new icon sets.
Revision: r3647
Author: 	 baloh.matevz
 2012-05-23 22:58:52 +01:00
cib
1b9b1fb4b7 Compile error. 2012-05-23 23:26:56 +02:00
cib
2f32046bbf Fixed a problem with meme gamemode setup. 2012-05-23 22:24:18 +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
Erthilo
2f120fc7e4 TG: -Medical borg overhaul. Instead of a dozen random one-use pills and syringes, 
they get an advanced hypospray that can switch between auto-replenishing
tricordrazine, inprovaline, and spaceacillin.
-Janitorborgs get a mop again, because without it they had no way of hitting
anything.
Revision: r3644
Author: 	 d_h2...@yahoo.com
 2012-05-23 18:10:28 +01:00
Erthilo
e7e6442c9e TG: Added Atmos glass doors. 
Revision: r3642
Author: 	 ericgfw...@hotmail.com
 2012-05-23 18:05:59 +01:00
Erthilo
be82872b5c TG: -Reverted default UI sprites to Erro's old-style. Retina-scalding Orange and new 
Midnight UI scheme are now found in screen1_Orange.dmi and screen1_Midnight.dmi,
respectively.
-Driest Martinis will no longer be invisible.
-Braincakes are now able to be cut into slices.
Revision: r3641
Author: 	 d_h2...@yahoo.com
 2012-05-23 18:02:00 +01:00
cib
e1355be043 Fixed the dumbest way to find a rune in src.loc ever. 2012-05-23 19:00:57 +02:00
Erthilo
2c00f71bb3 TG: The cbeck antags verb now logs correctly. 
Revision: r3639
Author: 	 petethegoat
 2012-05-23 17:48:07 +01:00
Erthilo
075e8730bc TG: RIG helmets can now be used as flashlights, just like hardhats. Credit to Sly 
for the sprites.
Revision: r3638
Author: 	 ericgfw...@hotmail.com
 2012-05-23 17:47:25 +01:00
Erthilo
361e479ed5 Fixes robolimbs surgery. 2012-05-23 17:38:44 +01: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
160baf3754 Fixes police tape being placed through windows. 2012-05-22 00:16:31 +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
3f50c37609 Fixes Odysseus buckled mob bug. 2012-05-21 23:50:27 +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
SkyMarshal
f4f0b77fc8 Merge pull request #1123 from Erthilo/master 
Implant removal surgery, damp rag changes
 2012-05-21 13:03:28 -07: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
03dc270006 TG: Fix for dragging HUD elements into lockers. 
Revision: r3635
Author: 	 petethegoat
 2012-05-21 20:42:15 +01:00
Erthilo
552fe3040e TG: - Fixed the bug where a belt which spawned on you would not display it's 
contents until dropped.
Revision: r3634
Author: 	 baloh.matevz
 2012-05-21 20:40: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