Unknown
3aa0fdfda5
Removes conductive flags from VR stuff
2019-03-28 21:45:38 -04:00
Neerti
30b967e28a
Items are now assumed to be conductive, rather than the opposite
2019-03-28 21:45:38 -04:00
Novacat
4c7370fb5d
Merge pull request #4811 from VOREStation/upstream-merge-5981
...
[MIRROR] Handtele no longer relies on teleporter being mapped in in very specific way
2019-03-28 21:28:30 -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
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
Novacat
2870ba8271
Merge pull request #4695 from VOREStation/upstream-merge-5856
...
[MIRROR] Fixes candle sprites
2019-03-27 20:54:57 -04:00
Novacat
94ae8fcc2a
Update candle.dm
2019-03-27 20:23:59 -04:00
Unknown
eca7086b45
Conflict Resolution
2019-03-27 19:24:13 -04:00
Anewbe
ac34c4b763
Stasis bags don't murder patients
2019-03-27 19:18:13 -04:00
Novacat
ffed098bf6
Merge branch 'master' into upstream-merge-5856
2019-03-27 19:00:41 -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
Unknown
ec19a66eff
Conflict Resolution
2019-03-27 16:36:41 -04:00
kevinz000
6415e4193f
[READY]Makes a bunch of processes subsystems instead
2019-03-27 16:03:51 -04:00
Unknown
6636f1ba37
Conflict Resolution Part 2
2019-03-27 15:51:05 -04:00
Novacat
abcde8fe5f
Merge pull request #4680 from VOREStation/upstream-merge-5825
...
[MIRROR] Adds ability to put butts in boxes
2019-03-27 15:19:30 -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
Novacat
cfe200ffc9
Merge pull request #4665 from VOREStation/upstream-merge-5824
...
[MIRROR] Fixes non-black/white paint buckets not actually having paint in them
2019-03-27 14:12:46 -04:00
Spades
eb0e2ec1f5
Guns sounds refactor and improvements
2019-03-27 10:42:18 -04:00
Novacat
7a13562736
Merge pull request #4620 from VOREStation/upstream-merge-5779
...
[MIRROR] Emergency tanks start full
2019-03-27 03:40:45 -04:00
Unknown
03dcb65c01
Fixes most of the issues
2019-03-27 00:38:44 -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
Atermonera
131636b1d2
Capitalizes initialize() to Initialize() because Destroy() is capitalized and this is pretty nerve-grinding
2019-03-26 13:21:08 -04:00
Unknown
85be5a9166
[5654] Resolves Merge Error
...
"But I wanted to play Hearts of Iron..."
"NO."
2019-03-01 23:58:05 -05:00
Spades
6e2172a5ae
Merge branch 'master' into upstream-merge-5654
2019-03-01 05:42:07 -05:00
Neerti
6de658bf0d
Merge pull request #5981 from Heroman3003/handtele-fix-fix
...
Handtele no longer relies on teleporter being mapped in in very specific way
2019-02-28 22:30:17 -05:00
Unknown
a4317b1910
[5654] Makes this PR Compile
...
This one made me cry.
2019-02-23 12:30:16 -05:00
Anewbe
3d557f93d0
Fixes candle sprites
2019-01-18 15:46:55 -05:00
Anewbe
1ea5885504
Merge pull request #5825 from PolarisSS13/butt_boxing
...
Adds ability to put butts in boxes
2019-01-14 21:23:41 -05:00
Spades
c6c7d98a2d
Merge branch 'master' into upstream-merge-5735
2019-01-14 11:20:55 -05:00
Neerti
e1cf31c565
Merge pull request #5835 from Cerebulon/ReligionUpdate
...
Updates Religion Lists + Adds Religious Paraphernalia
2019-01-14 03:47:00 -05:00
Neerti
58ca3dd469
Merge pull request #5824 from Heroman3003/paint_bucket_fix
...
Fixes non-black/white paint buckets not actually having paint in them
2019-01-12 04:23:21 -05:00
Spades
1338225afa
Resolves some merge conflicts
2019-01-05 16:29:19 -05:00
Spades
8c1b8aacb2
Merge pull request #4550 from Zap-zapper/size-im
...
Size control implant
2019-01-04 23:59:17 -05:00
Atermonera
565ca393d8
Merge pull request #5779 from Novacat/spriteadd
...
Emergency tanks start full
2018-12-30 17:08:38 -05:00
Spades
98e542144b
Merge pull request #4524 from VOREStation/upstream-merge-5715
...
[MIRROR] Updates Rapid Service Fabricators.
2018-12-12 21:25:02 -05:00
Spades
8c3c8c45c9
Merge pull request #4549 from Verkister/implantshuds
...
Fixes some implant related issues.
2018-12-12 21:19:41 -05:00
Zap-zapper
e7ae902098
Moving code from normal files to lewd files
2018-12-09 09:47:07 +07:00
Zap-zapper
3b2258ce38
size control implant
2018-12-08 17:12:33 +07:00
kevinz000
fc178c1e04
Makes math helpers defines for performance
2018-12-06 16:15:00 -05:00
Verkister
c1536879b2
Fixes some implant related issues.
...
-Fixes reagent implants being utterly bricked.
-Fixes backup implants not showing up in AR huds.
-Both issues were caused by implants now going way deeper into the bodyparts than before.
2018-12-05 17:47:19 +02:00
Atermonera
723a8081a0
Merge pull request #5715 from Mechoid/Service_Fab_Updoot
...
Updates Rapid Service Fabricators.
2018-12-01 00:17:23 -05:00
Atermonera
2df5e9fe0e
Merges AI Branch into Master
2018-12-01 00:06:38 -05:00
Unknown
66c81bd521
More fixes
2018-11-25 15:20:49 -05:00
Unknown
3e741038db
Not a child of crowbar, so code was not redundant
2018-11-25 12:22:30 -05:00
Spades
cdbaef570f
Deleted redundant code, added placeholder code
2018-11-25 10:10:07 -05:00
Unknown
191d294067
I like even numbers better
2018-11-25 00:44:58 -05:00
Unknown
8fbd5a5d0a
Adds Door Pry, to Ace's specifications
2018-11-24 16:23:17 -05:00
