cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 19:52:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,447 Commits 5 Branches 0 Tags
add3ed71c0892ea69e8dc22de0a74c60d0ffb27b
Commit Graph

6151 Commits

Author SHA1 Message Date
SkyMarshal
f76f5ae532 First pass on experimental change that allows zones to "Sleep" 2013-09-11 11:43:42 -07:00
Mark Aherne (Faerdan)
447f0a2fe7 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2013-09-09 22:43:09 +01:00
Mark Aherne (Faerdan)
901a3dae8e Documented Nano code. 2013-09-09 22:32:59 +01:00
Kilakk
0e08e80bb0 Changed syringes and vials to work correctly with the autolathe 2013-09-08 14:24:06 -04:00
Zuhayr
c7942b7eaf Merge pull request #3651 from SkyMarshal/airfixes 
ZAS update, needs testing.
 2013-09-07 05:46:04 -07:00
SkyMarshal
7d0c1f047a There we go, rebuilding works right now. Also has a slightly bugged verb that demonstrates how the rebuilding works, but you need to somehow prevent a zone from updating for it to show more than one "id" 2013-09-06 21:03:46 -07:00
Chinsky
cafa176548 Merge pull request #3647 from SkyMarshal/patch-2 
ZAS fix, Stops lasertag guns from killing you if you shoot it into your mouth.
 2013-09-04 07:20:15 -07:00
SkyMarshal
99bf9db04c Fixes lastertag guns killing you if you stick it in your mouth. 2013-09-03 22:51:37 -07:00
Zuhayr
b0d7a95189 Merge pull request #3644 from DJSnapshot/master 
Gave mods dsay command and unique dsay identifier
 2013-09-03 22:46:39 -07:00
SkyMarshal
e8f9d19c75 Completed ZAS rework. Needs testing, and consideration to make zones sleep. 2013-09-03 20:25:03 -07:00
DJSnapshot
2c41ad1429 Gave Mods dsay command and unique dsay identifier 2013-09-03 14:10:21 -07:00
Zuhayr
1b6d76f004 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 2013-09-03 23:46:04 -07:00
Zuhayr
3019942102 Minor language token fix. 2013-09-03 23:40:07 -07:00
Zuhayr
4e9e8e0e3d Fixes some Skrell hardsuit issues. 2013-09-03 23:38:46 -07:00
Zuhayr
f3631ba21e Added key to Check Languages. 2013-09-02 21:43:30 -07:00
Zuhayr
3f36adb002 Check Language verb. 2013-09-02 21:03:30 -07:00
Erthilo
3b61ba850f Merge branch 'master' of git://github.com/Baystation12/Baystation12 into dev 
Conflicts:
	baystation12.dme
	code/modules/projectiles/ammunition/bullets.dm
 2013-09-02 23:32:33 +01:00
Zuhayr
a8f0d5c4c2 Merged bullets.dm. 2013-09-02 14:16:53 -07:00
Mloc-Argent
72d158143b Previous commit apparently got swallowed by the git monster. 
Turns off auto FILE_DIR in .dme, fixes compile error.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-09-02 21:50:58 +01:00
Erthilo
9e17473f62 Uncomments books. Generifies mentions of tg or baystation. 2013-09-02 18:24:11 +01:00
Erthilo
8f3d303e45 Bicaridine slows but does not stop internal bleeding. 2013-09-02 17:53:28 +01:00
Erthilo
88a45d3cbf Job whitelist fix. 2013-09-02 17:51:49 +01:00
Erthilo
3662725155 Fixes for monkeycubes. 2013-09-02 17:44:47 +01:00
Erthilo
afcfed02bd Moved gas_filter_strength out of clothing and into gas masks. 2013-09-02 17:38:42 +01:00
Erthilo
37acbe9bf7 Fuel tanks uses explode() proc. 2013-09-02 16:10:43 +01:00
Erthilo
c08746206f Merge branch 'dev' of git://github.com/Baystation12/Baystation12 into dev 2013-09-02 12:24:55 +01:00
Mloc-Argent
a084f74c7d Expansion of every "icon = ''" path. 
Supposed to help compilation times.  Who knows.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-09-01 21:53:36 +01:00
Erthilo
720d74a0b7 Internal bleeding tweaked. Cryo and Bicaridine will prevent IB from bleeding and getting worse. Bicaridine over 30 units will slowly heal IB. IB cannot be completely healed by bicaridine until 10 minutes after getting IB. Bleeding rate for IB reduced. 2013-09-01 21:31:22 +01:00
Erthilo
c872099e11 Overdose added. Most chemicals over 30 units now cause constant toxic damage. Alcohol tweaked, excessive alcohol is poisonous. Chemistry-Reagents reorganized. Side effects removed. All toxins moved to toxins parent. 2013-09-01 21:23:37 +01:00
Erthilo
44540ab61f Recommitting PA sprites by Flash Kirby. 2013-09-01 21:10:39 +01:00
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
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
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