Commit Graph

1693 Commits

Author SHA1 Message Date
Heroman3003
e3e715454b Makes placeholder entries for lore writing 2019-04-23 11:13:42 +10:00
Neerti
cbb56b0546 Merge pull request #6124 from Heroman3003/window-message-fix
Fixes message on window frame fastening
2019-04-22 00:29:26 -04:00
Neerti
90e2d35db0 Merge pull request #6112 from Heroman3003/unredundanting
Removes redundant fix for a bug that never existed
2019-04-20 13:55:08 -04:00
Novacat
e2ae250af5 Merge pull request #5091 from VOREStation/upstream-merge-6101
[MIRROR] Fixes mapping tool icons for fulltile windows
2019-04-18 13:34:12 -04:00
Atermonera
412a870ede Merge pull request #6101 from Heroman3003/icon-window-fix
Fixes mapping tool icons for fulltile windows
2019-04-18 13:19:38 -04:00
Atermonera
836fe2be2b Merge pull request #6100 from Heroman3003/silicate-fix
Fixes silicate making fulltile windows invisible
2019-04-18 13:09:37 -04:00
Neerti
3f7d2a0450 Fixes fireaxe cabinets 2019-04-16 22:00:42 -04:00
Neerti
fc7c6f38b4 Base features for Precursotech and Anomalotech Expansion 2019-04-13 22:44:52 -04:00
Novacat
466516b066 Revert "Un-kevinzes nanoui and chemistry subsystems back into processes for greater good" 2019-04-08 15:24:27 -04:00
Unknown
0482da8c52 Ports two polaris bugfix PRs early 2019-04-06 12:21:24 -04:00
Heroman
b11015107c REVERT of nanoui/chemistry becoming subsystems (temp) 2019-04-05 13:30:32 +10:00
Unknown
7ecddb11de Service Keys Too 2019-04-03 15:11:06 -04:00
Unknown
2a100c5cb1 Command key box 2019-04-03 15:11:06 -04:00
Heroman
9b56460487 Fixes a typo 2019-04-02 17:57:30 +10:00
Heroman3003
eebd7c64a9 Fixes passive and mostly passive mobs blocking the way all the time 2019-04-02 09:27:24 +10:00
Neerti
f8c9664178 Explorer Update - Cataloguers 2019-03-30 16:19:24 -04:00
Novacat
63c6e7f308 Ports Stasis Cages from Baystation (#6017)
* Ports Stasis Cages from Baystation
2019-03-30 14:55:52 -04:00
Novacat
9fd697e007 Merge pull request #4873 from VOREStation/upstream-merge-5997
[MIRROR] Beakers for Botany
2019-03-28 22:02:37 -04:00
Novacat
d53ef70473 Merge pull request #4848 from VOREStation/upstream-merge-5996
[MIRROR] Fixed construction of fulltile electrochromic windows
2019-03-28 22:01:16 -04:00
Novacat
e2afa12e38 Merge pull request #4841 from VOREStation/upstream-merge-5992
[MIRROR] Departmental Turtlenecks
2019-03-28 22:00:31 -04:00
Neerti
30b967e28a Items are now assumed to be conductive, rather than the opposite 2019-03-28 21:45:38 -04:00
Unknown
d3837b76e8 Conflict Resolution 2019-03-28 19:41:16 -04:00
Anewbe
8ed384b38c Rewrites Atmospherics 2019-03-28 19:25:11 -04:00
Novacat
65cd059497 Merge pull request #4751 from VOREStation/upstream-merge-5869
[MIRROR] Adds the Zaddat Race + Modifies pressure damage calculations
2019-03-28 18:17:11 -04:00
Novacat
aab0d4625e Merge pull request #4759 from VOREStation/upstream-merge-5935
[MIRROR] Nerfs Sonic Speed Wheelchair
2019-03-28 17:43:33 -04:00
elgeonmb
9d056decda Adds the Zaddat Race + Modifies pressure damage calculations 2019-03-28 16:54:32 -04:00
Unknown
cf39c61c2d Conflict Resolution
This one made a lynx cry.
2019-03-28 13:19:19 -04:00
Neerti
3256202407 [READY]Ports /tg/station pixel projectiles, processing subsystems, timer subsystems, and some misc stuff to make it all work 2019-03-27 22:02:07 -04:00
Anewbe
ac34c4b763 Stasis bags don't murder patients 2019-03-27 19:18:13 -04:00
Novacat
dce3466f3b Merge pull request #4684 from VOREStation/upstream-merge-5814
[MIRROR] [READY]Makes a bunch of processes subsystems instead
2019-03-27 17:46:31 -04:00
Novacat
97e98dd04d Merge pull request #4682 from VOREStation/upstream-merge-5829
[MIRROR] Ports TGstation view variables + admin proccall guards, and all the baggage that comes with it
2019-03-27 16:37:45 -04:00
kevinz000
6415e4193f [READY]Makes a bunch of processes subsystems instead 2019-03-27 16:03:51 -04:00
Novacat
1bbb64494e Merge pull request #4678 from VOREStation/upstream-merge-5835
[MIRROR] Updates Religion Lists + Adds Religious Paraphernalia
2019-03-27 15:19:15 -04:00
Neerti
fe0b7373b3 Ports TGstation view variables + admin proccall guards, and all the baggage that comes with it 2019-03-27 14:49:30 -04:00
Neerti
91a5203e32 Adds New PoI Features + Bonus PoI 2019-03-27 12:15:50 -04:00
Anewbe
09b01407e3 Adds Various Sounds, Looping Sound System 2019-03-27 03:55:21 -04:00
Novacat
2f3edf4a72 Merge pull request #4612 from VOREStation/upstream-merge-5770
[MIRROR] Standardizes rotation verbs
2019-03-27 03:40:04 -04:00
Unknown
0c391cc252 Conflict Resolution 2019-03-27 03:22:15 -04:00
Neerti
b9adc37685 Standardizes rotation verbs 2019-03-27 03:17:07 -04:00
Atermonera
831ce7475e Merge pull request #5792 from Neerti/christmas_stuff
Ports the lightpost and present tree from tg.
2019-03-27 03:13:15 -04:00
Neerti
585b688709 Adds Identification System, New Autoinjectors 2019-03-27 02:25:55 -04:00
Neerti
86174593bf Replaces GoonPS scheduled_tasks and obj processing with SMC processing subsystems and timer 2019-03-26 23:58:26 -04:00
Unknown
976aec2f71 Sorts out this PR 2019-03-26 21:43:56 -04:00
Atermonera
b4db45e1ea Merge pull request #5997 from mistyLuminescence/plantbeakers
Beakers for Botany
2019-03-26 17:17:01 -04:00
Atermonera
131636b1d2 Capitalizes initialize() to Initialize() because Destroy() is capitalized and this is pretty nerve-grinding 2019-03-26 13:21:08 -04:00
Anewbe
b84f216b87 Merge pull request #5996 from Heroman3003/master
Fixed construction of fulltile electrochromic windows
2019-03-12 19:59:57 -04:00
Atermonera
bf7686cd02 Merge pull request #5992 from mistyLuminescence/turtlenecks
Departmental Turtlenecks
2019-03-08 01:45:09 -05:00
Spades
6e2172a5ae Merge branch 'master' into upstream-merge-5654 2019-03-01 05:42:07 -05:00
Spades
71d1a05531 Merge pull request #4543 from VOREStation/upstream-merge-5747
[MIRROR] Makes fulltile windows seperate from dir
2019-02-25 08:57:19 -05:00
Sebbe9123
420803122b re-fixes this file since it wasn't obvious I was a brainlet before. 2019-02-20 23:50:07 +01:00