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,819 Commits 10 Branches 0 Tags
2f001078b1cc1d92d68a081dcd515ae2ecfc71f5
Commit Graph

4387 Commits

Author SHA1 Message Date
Albert Iordache
2f001078b1 Merge pull request #1162 from CIB/master 
Added crew transfer shuttle to the restart vote, disease fix
 2012-05-25 22:46:39 -07:00
Erthilo
a02a12f88f Added Flashkirby's RIG and cow sprites. Removed and added some new AI Ion laws, credit: Ispil. 2012-05-26 01:36:45 +01:00
cib
4e79302e4b Disease changes. 
- Removed all emote symptoms.
- Cleaned and organized the file.
- Added vomit and blood loss symptoms.
 2012-05-25 19:11:26 +02:00
cib
20b0656c35 Moved the vomit() and the drip() proc to /mob/living/carbon 2012-05-25 18:57:53 +02:00
cib
568f951918 Merge github.com:Baystation12/Baystation12 2012-05-25 17:59:09 +02:00
Jim "Apples"
c181d9369b Merge pull request #1165 from AppleMaster/master 
New Barsigns, Yay!
 2012-05-25 08:52:11 -07:00
Apple_Master
65f0b07b05 Added some new barsigns, will soon be adding a method to choose which one you have, but only once per round. 
Signed-off-by: Apple_Master <cheeckan@gmail.com>
 2012-05-25 13:52:53 +01:00
Erthilo
c9ea8a4c3d Fix for duplicate health analysers in the NanoMed dispensers, and changelog. Also changes old hud storage boxes to solid. 2012-05-25 04:09:17 +01:00
Erthilo
df59274464 Better sprite for non-standard tank assemblies. New cool jacket from Flashkirby! 2012-05-25 02:06:05 +01:00
Erthilo
2a3967abf3 Renames Emergency Medical Technician to Emergency Physician to avoid "lol u not doctor". Virologists get their jumpsuit and labcoats back, yay! Fix for observers being able to observe than join a round immediately. 2012-05-24 23:19:52 +01:00
Erthilo
1c8b1b7c72 Fixes pill bottle pickup by removing a rogue attackby proc. 2012-05-24 23:12:04 +01:00
cib
0616ccd7ed Robot limbs now can't be broken by disease. 2012-05-24 23:49:52 +02:00
cib
b6c1c0e214 Temp. 2012-05-24 23:49:45 +02:00
cib
2c58ab416e Added Crew Transfer Shuttle to the restart vote. 2012-05-24 23:00:47 +02:00
cib
2b851f70bf Merge github.com:Baystation12/Baystation12 2012-05-24 21:08:47 +02:00
cib
111c8b9dbb Hunger system tweaks. 
- Reverted hunger rate from 0.05 to 0.1
- Lessened the slowdown effect of being hungry to 1/4
- You will now receive hunger messages a bit earlier.
 2012-05-24 21:01:20 +02:00
CIB
53cabd56f0 Merge pull request #1157 from Thrain856/master 
Crew Transfer
 2012-05-24 04:38:58 -07:00
Thrain
c1ca3d58de Added a "Initiate Crew Transfer" option to the Communications computers. 
This will call the shuttle, which will start the round reboot. shuttle
starts with a 90 minute refuel timeq.
 2012-05-24 02:09:34 -07:00
CIB
b2ee78f697 Merge pull request #1155 from CIB/master 
Blood fix
 2012-05-24 01:45:04 -07:00
cib
636b2d573a Lack of blood_DNA will no longer lead to all blood mysteriously evaporating. 2012-05-24 10:44:04 +02:00
Uristqwerty
fb51e184f2 Yep, thee was a bug. 2012-05-24 02:29:54 -04:00
Uristqwerty
01b038ff27 Introducing Uristrunes! 
Built crom components, each cult word gets it's own unique appearance,
that it adds to the final rune. Correct combinations will glow ever so
slightly, the others remain a single colour.

The system behind them is a bit more powerful, supporting a full 1023
combinations, although far fewer can be reached in-game (as the system
doesn't care about word order, and you can't use enough words to have
more than three of the components as part of any rune).


With this commit, it compiles, but I haven't quite tested anything
in-game, so there might be a followup bugfix. Or there may not.
 2012-05-24 01:34:35 -04:00
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