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
14,790 Commits 10 Branches 0 Tags
a4e5bad4098b901bab0594fccf921ebaf831e4fe
Commit Graph

6279 Commits

Author SHA1 Message Date
Mark Aherne (Faerdan)
f9906ef76e Styling improvements for Chem Dispenser and DNA Modifier Nano UIs. 
Injector buttons are now disabled when the injector system is not ready.
 2013-09-20 23:08:04 +01:00
Cael Aislinn
955160e9d6 moves and renames economy files to /modules instead of /wip, cleanup and shuffles of a bunch of code, removes "linked_db" (requirement for financial machinery to be connected to an accounts database) 
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
 2013-09-20 13:35:49 +10:00
Segrain
a24fd41829 Fixes for typos. 2013-09-19 08:37:29 +03:00
Segrain
0b661bc854 Fixes for stacks. 2013-09-19 08:34:38 +03:00
Segrain
9eee328d34 Verb categories. 2013-09-19 08:30:05 +03:00
Mark Aherne (Faerdan)
e0924bf4ab Multiple minor updates to Nano. 
Created new DNA Modifier Nano UI.

Refactored the DNA Modifier code.
 2013-09-19 01:39:59 +01:00
Kilakk
9bd3f2997c Added in an awesome fax machine sprite by Cajoes 2013-09-18 19:41:29 -04:00
Kilakk
e1192fea75 World loop removed successfully 2013-09-16 17:12:36 -04:00
Segrain
35621466e1 Merge conflict fix. 2013-09-14 22:49:11 +03:00
Segrain
91068e31c8 Falling fix. 2013-09-13 19:45:22 +03:00
Segrain
d5f20aa874 Colour fix. 2013-09-13 19:43:59 +03:00
Segrain
9723a98ade Iconfix. 2013-09-13 19:40:09 +03:00
Segrain
d13f9e617b Fix for #3666. 2013-09-13 19:38:21 +03:00
Segrain
3dd5b22ae7 Fix for #3662. 2013-09-13 19:24:25 +03: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
jack-fractal
474f44645d Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-09-12 00:10:12 -04:00
jack-fractal
e73c06e51c Fixing a bug in the cyborg taser that caused it to continue draining cell-power from the cyborg even after it had finished recharging. 2013-09-11 23:33:23 -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
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
Zuhayr
ca5036fd71 Wirecutter use on gloves will remove Tajaran and Unathi restrictions. 2013-09-10 00:15:37 -07:00
Zuhayr
8869718963 Customisation kits for Taj engineers. 2013-09-09 23:35:50 -07:00
Zuhayr
7ab7a61812 Merge resolution, using dev-freeze map. 2013-09-09 21:59:47 -07:00
Zuhayr
161ec9ab98 Minor language token fix. 2013-09-09 21:52:23 -07:00
Zuhayr
f8d40ab907 Fixes some Skrell hardsuit issues. 2013-09-09 21:51:15 -07:00
Zuhayr
55865f7b1e Added key to Check Languages. 2013-09-09 21:51:04 -07:00
Zuhayr
a5234383e1 Check Language verb. 2013-09-09 21:50:52 -07: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