cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 03:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,682 Commits 5 Branches 0 Tags
14ee1bccbb12bf9c85e859df1cf5ac2a328ae10c
Commit Graph

10927 Commits

Author SHA1 Message Date
Zuhayr
46b9d87470 Merge pull request #3621 from alex-gh/multiple_pills 
It is now possible to create multiple pills at once in the Chemmaster
 2013-09-01 04:53:26 -07:00
Zuhayr
1067f083c6 Merge pull request #3625 from Erthilo/dev 
Megaphones, robot health analyzer, eye dropper delay, rigged cells explode in more scenarios
 2013-09-01 04:53:08 -07:00
Zuhayr
332b5fd3e4 Merge pull request #3627 from Faerdan/dev 
Fixed client side UI failure caused by apostrophes in text.
 2013-09-01 04:50:16 -07:00
Mark Aherne (Faerdan)
cffdca9596 Fixed client side UI failure caused by apostrophes in text. 
Updated the Chem Dispenser UI with an Energy bar.

UIs attached to the Chem Dispenser will now update on recharge(), recharge now recharges 1 every 15 ticks instead of 2 every 30 (to make it feel more fluid).
 2013-09-01 00:55:46 +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
961ebcec35 Added Megaphones to all Heads offices. 2013-08-31 22:14:31 +01:00
Erthilo
dc5781f05b Officers can be set as rev. 2013-08-31 22:13:59 +01:00
Erthilo
b69c3b2ee4 Change hailer to hearable message. 2013-08-31 22:11:24 +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
bc779a1eeb Indentation compile fix. 2013-08-31 17:49:07 +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
Mloc
2454d72233 Merge pull request #3620 from Segrain/master 
Bugfix.
 2013-08-31 08:07:26 -07:00
Segrain
7dae19a3f9 Fix for #3498. 2013-08-30 04:40:39 +03: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-Argent
d2d08208a8 made zburn/firelevel more predictable. Probably won't change much ingame, but it's a start. 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-08-29 22:06:27 +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
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
Alex
cf829c3cd6 It is now possible to create multiple pills at once in the Chemmaster 2013-08-29 09:55:35 +02: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
c17347ef77 Added CubeJackal's security gear to the appropriate lockers. 2013-08-28 22:31:22 -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
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
Segrain
8d1fdd87b3 Typecheck fix. 2013-08-29 02:24:40 +03: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
Zuhayr
3762fcc4a8 Merge pull request #3610 from Mloc/master 
Space no longer freezes mobs.
 2013-08-28 10:48:57 -07: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
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
Mloc
208ef684ad Merge pull request #3603 from Erthilo/master 
Fixes Thermite
 2013-08-28 06:06:54 -07:00
Mloc
489e037bcd Merge pull request #3599 from Erthilo/master 
Logs, lots and lots of logging, glass shards and suits, Prison button
 2013-08-28 05:37:01 -07:00