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

10838 Commits

Author SHA1 Message Date
ZekeSulastin
1d21cc7e55 Missed a couple 'color to item_color' in stamps.dm 2013-09-29 23:57:08 -04:00
Mloc
49c0a30301 Merge branch 'master' into dev 
Conflicts:
	baystation12.dme
	html/changelog.html
 2013-09-26 10:26:03 +01:00
DJSnapshot
caa6cd6c8a votes now show number of votes, no longer mute OOC, and show results. It is no longer possible to call a crew transfer during red/delta alert, and a new proc called autotransfer() has been added, but has yet to have anything to trigger it. 2013-09-24 23:41:21 -07:00
Chinsky
4b17be8215 Merge pull request #3693 from caelaislinn/accounts_updates 
Economy/Accounts updates
 2013-09-24 10:15:10 -07:00
DJSnapshot
a11f1d4bdb Hotfix for infinite mangling of gloves. 2013-09-22 13:10:14 -07:00
Kilakk
b5095646e2 Mining shuttle console now tells you if the shuttle is moving or not 2013-09-22 15:48:39 -04:00
Mloc-Argent
e9bf414820 Refactors code to work with BYOND 500. 
500 adds a "color" var to /atom, which conflicts with /obj/item/color, /obj/atmospherics/color and various simple_animals.
  /obj/item/color is now item_color
  /obj/atmospherics/color is now pipe_color
  simple_animals color is now body_color
Removes transformer.dm since it conflicted with transform() and was never used.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-09-22 12:39:48 +01:00
Mark Aherne (Faerdan)
a2438f3e80 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2013-09-20 23:13:07 +01:00
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
Mark Aherne (Faerdan)
1fe407f769 Updates to Nano DNA Modifier UI: 
* Fixed DNA block selection.
* Added change label button.
* Added Block Injector button.
 2013-09-20 01:02:08 +01: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
Segrain
ed4389c676 Fix for invisible carpets. 2013-09-19 08:27:34 +03:00
Mark Aherne (Faerdan)
21485aa1fd Styling fixes for DNA Modifier Nano UI. 
Fixed wipe and eject disk buttons.
 2013-09-19 02:12:57 +01: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
Kilakk
6c4644664e Absolute paths for faxmachine procs 2013-09-16 17:09:36 -04:00
Segrain
a80efba1fb Fix for #3683. 2013-09-15 19:39:53 +03:00
Segrain
c055f722dd Localised implant detection. 2013-09-14 23:50:31 +03:00
Segrain
35621466e1 Merge conflict fix. 2013-09-14 22:49:11 +03:00
SkyMarshal
1f634873ea Merge pull request #20 from SkyMarshal/patch-3 
Fixes EFTPOS units failing to connect to account DB.
 2013-09-13 21:14:31 -07:00
SkyMarshal
7d81b02dbe Fixes EFTPOS units failing to connect to account DB. 2013-09-13 21:13:43 -07:00
SkyMarshal
7b1974e4b5 Prevents the accounts database from automatically being removed from machines. 2013-09-13 21:12:49 -07:00
Segrain
9eaf5cf273 Smallfix. 2013-09-13 19:46:45 +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
d658b256e3 Fix for announcing gamemode ties. 2013-09-13 19:42:54 +03:00
Segrain
d8ad339fd8 Fix for throwing damage. 2013-09-13 19:41:23 +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
Segrain
10150208d1 Fix for #3668. 2013-09-13 19:22:31 +03:00
Chinsky
c5c65c2f25 Merge pull request #3673 from LethalGhost/patch-1 
Fix for stool picking up.
 2013-09-12 22:51:38 -07:00
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
Lethal Ghost
09dc90c46b Fix for stool picking up. 2013-09-13 00:23:16 +06:00
meyar
2dd7fe538b Derp, deleted airlock access. MY B. 2013-09-12 13:49:49 -04:00
meyar
ef4defdae0 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-09-12 13:16:46 -04:00
meyar
3d6b510395 Restores a magically lost (again) feature. Traitor ID cards being reforgable. 2013-09-12 13:14:57 -04: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
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
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