cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-03 14:04:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,682 Commits 7 Branches 0 Tags
14ee1bccbb12bf9c85e859df1cf5ac2a328ae10c
Commit Graph

6125 Commits

Author SHA1 Message Date
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
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
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
Segrain
9eaf5cf273 Smallfix. 2013-09-13 19:46:45 +03:00
Segrain
d8ad339fd8 Fix for throwing damage. 2013-09-13 19:41:23 +03:00
Segrain
d13f9e617b Fix for #3666. 2013-09-13 19:38:21 +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
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
Zuhayr
7ab7a61812 Merge resolution, using dev-freeze map. 2013-09-09 21:59:47 -07: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
e8f9d19c75 Completed ZAS rework. Needs testing, and consideration to make zones sleep. 2013-09-03 20:25:03 -07:00
SkyMarshal
073f462e1b WIP ZAS rework. 2013-09-03 20:25:02 -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
Erthilo
9e17473f62 Uncomments books. Generifies mentions of tg or baystation. 2013-09-02 18:24:11 +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
0008d649b0 Silent fix for megaphone. 2013-09-02 12:26:06 +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
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
235e09d2b9 Changed icon path for custom items due to compile times. 2013-09-01 13:24:38 +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
Erthilo
5d1c4548fa Cell.use checks instead of just minuses. Yay for code! 2013-09-01 00:16:11 +01:00
Erthilo
961ebcec35 Added Megaphones to all Heads offices. 2013-08-31 22:14:31 +01:00