cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-31 09:09:49 +01:00
Code Issues Packages Projects Releases Wiki Activity
14,461 Commits 13 Branches 0 Tags
e7fe8f3945e424e4f94a31aac3c4e4595bc2a480
Commit Graph
10789 Commits
Author SHA1 Message Date
Mark Aherne (Faerdan) 9378ce2402 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2013-09-12 20:58:06 +01:00
Mark Aherne (Faerdan) 231387776b Split dna.dm into three files to make it easier to browse the code. 
This is a pre-cursor to my DNA Modifier rewrite using Nano UI.
 2013-09-12 20:55:10 +01:00
Chinsky b73d92c4f4 Merge pull request #3669 from SkyMarshal/airfixes 
Zones can now sleep, multi-tile firedoors are sprited, and gas masks no longer have their fingers in gas mixture code...
 2013-09-12 00:13:45 -07:00
Chinsky 5e8a1278aa Merge pull request #3670 from Faerdan/dev 
Nano UI Updates
 2013-09-12 00:11:39 -07:00
Kilakk 02c8ae13cc Fixes #3668, added detection for known implants to the med scanner 
doesn't include explosive implants, etc.
 2013-09-11 21:47:29 -04:00
Mark Aherne (Faerdan) 2e957c8b51 Updated the documentation for the ui_interact proc. 
Moved the client nanoclose verb into nanoexternal.dm.

Removed debug comments.
 2013-09-11 22:24:21 +01:00
Mark Aherne (Faerdan) 762baa490f Better documentation for the ui_interact proc. 2013-09-11 21:46:59 +01:00
Mark Aherne (Faerdan) 8a6094685a Minor fixes. Added Templates Guide (wip). 2013-09-11 21:27:54 +01:00
SkyMarshal 92f389546b Removes the gas mask filtering stuff from gas mixtures. Moved it into the relevant "life" code. 2013-09-11 12:09:23 -07:00
SkyMarshal add3ed71c0 Added new two-tile hazard door sprites, thanks to Ravensdale, and fixed a derp with the new ZAS sleeping stuff. 2013-09-11 11:43:42 -07:00
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
Kilakk eb19112ab4 Added vials, syringes, and proximity sensors to the autolathe 2013-09-08 14:23:20 -04:00
Zuhayr c7942b7eaf Merge pull request #3651 from SkyMarshal/airfixes 
ZAS update, needs testing.
 2013-09-07 05:46:04 -07:00
SkyMarshal 9c87960852 Bluh. 2013-09-06 21:11:46 -07:00
SkyMarshal 301de25bae Fixes the not-considering-actual-geometry issue. 2013-09-06 21:07:34 -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
SkyMarshal 1762c65640 man I am bad at this 2013-09-06 19:57:55 -07:00
SkyMarshal 057c8eeacd Fixed a minor derp. 2013-09-06 19:46:48 -07:00
SkyMarshal 5eb87a8b13 Use of two-pass connected component labeling to improve zone rebuilding 
Signed-off-by: SkyMarshal <skymarshal1729@gmail.com>
 2013-09-06 19:10:29 -07:00
SkyMarshal 3b2da3238c Reduces processing of connections, zones now rely on the air properties of constituent turfs (they will adjust these properties when turfs are added or removed) 2013-09-06 15:41:50 -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 081356f21b Fixes longstanding connection bug. 2013-09-03 20:58:26 -07:00
SkyMarshalandSkyMarshal e8f9d19c75 Completed ZAS rework. Needs testing, and consideration to make zones sleep. 2013-09-03 20:25:03 -07:00
SkyMarshalandSkyMarshal 073f462e1b WIP ZAS rework. 2013-09-03 20:25:02 -07:00
DJSnapshot 2c41ad1429 Gave Mods dsay command and unique dsay identifier 2013-09-03 14:10:21 -07:00
Zuhayr 24764131af Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-09-03 23:46:18 -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
SkyMarshal 94fc06d0df Temporary fix for ZAS processing twice per time interval. 2013-09-03 00:41: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
Zuhayr 4d51f2e419 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-09-02 20:46:17 -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 9633dd9073 Alarm runtime fixes. 2013-09-02 17:45:38 +01:00
Erthilo 1e499d8994 Sleeper adjustments. Cannot inject over 20 units. 2013-09-02 17:45:24 +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 0008d649b0 Silent fix for megaphone. 2013-09-02 12:26:06 +01:00