cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 11:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,378 Commits 5 Branches 0 Tags
a4829a271e217563f80be9cdad5a1e809588ef2f
Commit Graph

6115 Commits

Author SHA1 Message Date
Erthilo
a4829a271e Gas mask filters Plasma and N2O. 2013-09-01 20:51:19 +01:00
Erthilo
469cc55020 Readjusts pill chems due to overdose. Adds pill dissolve logging. 2013-09-01 20:47:54 +01:00
Erthilo
d576997bfa Fuel tanks explode from fire. 2013-09-01 20:10:25 +01:00
Erthilo
235e09d2b9 Changed icon path for custom items due to compile times. 2013-09-01 13:24:38 +01:00
Erthilo
74c19d4ec8 Added vacuum flask to bar. 2013-09-01 13:24:13 +01:00
Erthilo
4f4fb38baf Changed pin to a 4 digit number. Game year standardised to this year +544. 2013-09-01 13:23:23 +01:00
Erthilo
5d1c4548fa Cell.use checks instead of just minuses. Yay for code! 2013-09-01 00:16:11 +01:00
Erthilo
f31185e052 Robot Analyzer. Health analyzer for robots. 2013-09-01 00:15:47 +01:00
Erthilo
03b716e0cd Adds delay to eye dropper. 2013-08-31 22:10:52 +01:00
Erthilo
1992a10b52 More attempts at string limit string reduction. 2013-08-31 20:13:03 +01:00
Erthilo
eb318ec861 Species now have individual punch damages. 2013-08-31 20:12:40 +01:00
Erthilo
547c1e670d Adds janitorial cart from tg, replacing janicart. Adds in some NanoUI stuff to make it work. 2013-08-31 20:12:19 +01:00
Erthilo
b75d97a488 Merge branch 'master' of git://github.com/Baystation12/Baystation12 into dev 
Conflicts:
	code/game/machinery/kitchen/gibber.dm
	code/modules/mob/living/carbon/human/inventory.dm
	code/modules/reagents/reagent_containers/hypospray.dm
	maps/tgstation2.dmm
 2013-08-31 17:45:31 +01:00
Erthilo
a7f1b50f1b Fixes reagent and throw logging. 2013-08-30 00:38:10 +01:00
Erthilo
4f6948885c Comments out preload_vox() as it causes long delays with initial start window and subsequent windows when first logged in. 2013-08-29 22:08:11 +01:00
Mloc
15b0fc24a3 Merge pull request #3611 from Erthilo/dev 
Medical tweaks, fixes, admin secrets
 2013-08-29 03:51:09 -07:00
Zuhayr
0803db44b2 Merge pull request #3612 from Faerdan/dev 
Added Nano UI Chemistry Dispenser plus misc Nano tweaks/fixes.
 2013-08-28 19:08:03 -07:00
Mark Aherne (Faerdan)
9cb0b79d78 Fixed issue with links/buttons not working until first update. 2013-08-28 22:20:13 +01:00
Erthilo
c483d58e34 Renabled admin secrets, as they are are admin only. 2013-08-28 19:44:02 +01:00
Erthilo
74c3975ae3 Fixes shock going up too much. 2013-08-28 19:43:36 +01:00
Mloc-Argent
9fed22c056 Space no longer freezes mobs. 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-08-28 18:49:00 +01:00
Mloc
4d928843b1 Merge pull request #3609 from Zuhayr/dev 
Stuff from dev-freeze.
 2013-08-28 10:40:58 -07:00
Zuhayr
b6912d292c Added light to previous commit. 2013-08-29 03:38:52 -07:00
Zuhayr
3e13680498 Tajaran hardsuit code. 2013-08-29 03:11:55 -07:00
Zuhayr
e7d7a63177 Type of unathi breacher fixed. 2013-08-29 00:42:40 -07:00
Zuhayr
99b57c1a8e Skrell suit sprite fix, oops. 2013-08-29 00:41:47 -07:00
Zuhayr
5f1f54f296 Forgot an exclude. 2013-08-29 00:39:13 -07:00
Zuhayr
36fa588df5 Unrestricted sandals, clown shoes, galoshes. 2013-08-29 00:38:00 -07:00
Zuhayr
fb7ca1348c Added species restrictions to hardsuits, shoes, helmets. Added Skrellian hardsuits and helmets. 2013-08-29 00:35:41 -07:00
Zuhayr
f378dfa350 Species type check for clothing adjustment. 2013-08-29 00:03:16 -07:00
Zuhayr
dabd0866a2 As above. 2013-08-28 23:34:12 -07:00
Zuhayr
1b41e4a582 Security item fixes, sprite fixes. 2013-08-28 23:33:46 -07:00
Zuhayr
3f3c0f80bb Type path fix. 2013-08-28 22:55:03 -07:00
Zuhayr
05e223d248 Minor fix for previous commit. 2013-08-28 22:28:31 -07:00
Zuhayr
f1f0a3e340 Added species_restricted list to clothing, added check for equipping clothing with species_restricted set. Only species on the list can equip the gear, if the equipper is human. 2013-08-28 22:17:40 -07:00
Zuhayr
93011399f0 CubeJackal's new sec uniforms. 2013-08-28 21:18:14 -07:00
Zuhayr
0dba5c14b4 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-08-28 20:40:19 -07:00
Erthilo
0219ffe41e Pull damage, with harsher damage in crit. Soft crit now at 0 health, you no longer suffocate in softcrit. Being between 0 to -50 health will cause you to go into shock. Below that you pass out and stop breathing. Stasis bags clone damage reduced to stop people dieing in them so much. 2013-08-28 17:38:21 +01:00
Mark Aherne (Faerdan)
ccaa451313 Added Nano UI Chemistry Dispenser. 
Fixed UI update issue with non auto-updating UIs.

Misc tweaks for CSS and JS for UI styling.
 2013-08-28 17:13:25 +01:00
Erthilo
0cb361f737 Removed undeeded "ATTACK:" 2013-08-28 03:37:11 +01:00
Erthilo
3fbdc99079 Standardises logging. All attack logs now print in main logs. Added stripping and syringe logging. Added Jump commands to most attack logs. 2013-08-28 03:33:04 +01:00
Erthilo
7e61e0c01c Strip logging, two ear version. 2013-08-28 01:58:15 +01:00
Erthilo
7a319904e4 Reverts gender checks as it was breaking with NEUTER and breaking facial hair. 2013-08-27 22:51:24 +01:00
Asanadas
a91560d75b Merge pull request #3594 from Erthilo/dev 
Short Centcomm message delay, 2 ears, alert level, internal affairs stamps
 2013-08-27 14:48:48 -07:00
Erthilo
5f68a4c656 Misc formatting errors. 2013-08-27 22:10:47 +01:00
Erthilo
a229582187 Added IA stamps, IA office has a receiving desk. 2013-08-27 22:10:20 +01:00
Erthilo
5437b1bbac Added two ears back. 2013-08-27 22:05:27 +01:00
Erthilo
1fd0522276 Gives Internal Affairs PDA a Message Centcomm option. Shortens Centcomm message time as it wasn't really being abused. Formats Centcomm messages better. 2013-08-27 14:24:12 +01:00
Chinsky
00f9a3bbb2 Merge pull request #3588 from Giacomand/dev 
Re-added AI vocal announcements with improvements.
 2013-08-27 05:32:25 -07:00
Zuhayr
6d5d510a91 Merge pull request #3590 from Segrain/dev 
Stating laws for cyborgs.
 2013-08-26 16:44:05 -07:00