cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-25 17:42:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,790 Commits 2 Branches 1 Tag
a4e5bad4098b901bab0594fccf921ebaf831e4fe
Commit Graph

2084 Commits

Author SHA1 Message Date
Cael Aislinn
a4e5bad409 fixes an overwritten fusion reaction, fixes typo on id computer, makes transit tubes traversible, makes conveyor switches access protected 
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
 2013-10-29 05:10:17 +10:00
DJSnapshot
751aaa21f4 Merge pull request #3836 from Nanai/dev 
Miscellanities!
 2013-10-27 22:56:48 -07:00
Nanai
b4ea0491c8 Miscellanities: Fixing more broken fluff clothing articles, secondary stamp DMI updated, hemostats added to autolathe to frolick with it's fellows. 2013-10-28 01:46:31 -04:00
Kilakk
8b4e5d07e6 Added vending machine stocking 
* Now with more del() than ever before
* Only works if you have the maintenance panel open
 2013-10-27 01:49:19 -04:00
Nanai
219fac680d Changes the vending machine to account for new drinks, adds grape juice to the juicer. 2013-10-21 07:09:46 -04:00
Nanai
137cbba8e4 Cloning pod altered to hold 3 clones worth of biomass at roundstart. 2013-10-20 17:38:26 -04:00
Nanai
461794c662 Cloning pod altered to hold 3 clones worth of biomass at roundstart. 2013-10-20 17:07:02 -04:00
ZekeSulastin
28d546f2b1 Added dialysis volume. Also numbness message for entering. 2013-10-19 17:03:13 -04:00
ZekeSulastin
3455bf7cc1 Add/remove beaker from sleeper for dialysis 
Redoes the sleeper attackby() prompt to match cryo's style.  Also
removes the millionbeaker in favor of a standard large.
 2013-10-19 17:03:13 -04:00
ZekeSulastin
0df64f898c Added dialysis to sleepers 
Rapidly removes reagents from patient at the cost of blood.

Ported from Jamini's NEV Unity codebase.
 2013-10-19 17:03:13 -04:00
jack-fractal
3732a9c3b9 Adding the dispensers to the cargo lists. 
Making a sub-type of the dispensers so that they spawn disconnected from the ground.
 2013-10-17 19:48:57 -04:00
Chinsky
01512e571b Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into lockdown 
Conflicts:
	code/game/machinery/doors/firedoor.dm
 2013-10-11 22:29:59 +04:00
Segrain
eb9a337d07 Merge remote-tracking branch 'upstream/master' into dev 2013-10-11 12:44:44 +03:00
Chinsky
032d69742f Derp 2013-10-10 14:46:22 +04:00
Chinsky
29ea7f0d3a Merge branch 'dev-freeze' into dev 
Conflicts:
	html/changelog.html
	maps/tgstation2.dmm
 2013-10-10 14:37:41 +04:00
Chinsky
6e07981e67 Applied Arancalos fix for firedoors, no more process for them 2013-10-10 14:14:48 +04:00
Chinsky
b96f9ef650 Merge pull request #3744 from Baystation12/dev-freeze 
BYOND AKBAR
 2013-10-10 02:45:45 -07:00
Mloc-Argent
65f218ee63 Merge branch 'master' into dev-freeze 
Conflicts:
	code/ZAS/Fire.dm
	html/changelog.html
	maps/tgstation2.dmm

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-10-08 22:01:16 +01:00
Chinsky
7555dd0f0b Merge branch 'master' into dev 
Conflicts:
	code/setup.dm
 2013-10-08 15:16:57 +04:00
Chinsky
3c678d7990 Merge pull request #3735 from Mloc/fixeroos 
Fixes.
 2013-10-08 02:35:03 -07:00
Mloc-Argent
ebf2ba2d4a Fixes. 
Made glowshrooms and intercoms not use a ridiculous internal loop, and fixed a pickup luminosity bug with glowshrooms.
fixes #3708
Fixes #3718
Fixes #3702

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-10-07 20:35:26 +01:00
Mloc-Argent
8b2c3fc153 Massive click code rework by SuperSayu, ported from TG. 
Full details at https://github.com/tgstation/-tg-station/pull/1206
Fixes #3648

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-10-07 20:24:21 +01:00
Mloc-Argent
be8bffbc5b Ported code from /tg/station to make brig timer panels and status displays use maptext instead of expensive icon procs. 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-10-07 20:13:39 +01:00
Chinsky
f5d17f89f2 Changes to airlock opening: 
-Only people with engineering access can open them by hand.
-Crowbarring them open/close now takes some time (~3 sec)
 2013-10-05 10:12:46 +04:00
Chinsky
1ff9a20f68 Standartized definitions. 2013-10-05 09:16:56 +04:00
Chinsky
1f53ed0591 Merge pull request #3722 from Baystation12/master 
Master -> Dev
 2013-09-30 16:01:20 -07:00
Chinsky
86715a423b Partial fix for #3697 
Would not carry over gutter and such, only species-specific languages.
Full fix would require moving languages out of mob into mind, and I am really lazy, this will cover 98% cases.
 2013-10-01 00:16:29 +04:00
Mloc
49c0a30301 Merge branch 'master' into dev 
Conflicts:
	baystation12.dme
	html/changelog.html
 2013-09-26 10:26:03 +01: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
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
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
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
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
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
9633dd9073 Alarm runtime fixes. 2013-09-02 17:45:38 +01:00