Spades
1eaa3266ba
Merge pull request #4088 from VOREStation/upstream-merge-5446
...
[MIRROR] Fireaxe cabinets find their fireaxes in initialize(), rather than new()
2018-09-10 07:02:36 -04:00
Spades
50c0c7bedf
Merge branch 'master' into upstream-merge-5446
2018-09-09 17:58:23 -04:00
Spades
eb94467f39
Merge branch 'master' into upstream-merge-5432
2018-09-09 17:57:31 -04:00
Neerti
74f70c940b
Merge pull request #5522 from Atermonera/PDA_comms2
...
Implements commcards (Communicator cartridges)
2018-09-09 03:06:21 -04:00
Mechoid
0651206a51
Refactor cargo trains, they're just normal trains now. Adds the Quad, and re-enables/fixes the Space Bike!
2018-09-08 23:05:08 -07:00
Spades
26a227b342
Merge pull request #4065 from VOREStation/upstream-merge-5427
...
[MIRROR] Fixes the fireaxe cabinet
2018-09-07 10:50:27 -04:00
Poojawa
5d0328d0e5
fixes the trailing tag, I think
2018-09-05 21:42:27 -05:00
Poojawa
6b403022a7
Ports /vg/ instrument frame work, adds client based sound pref
...
Also shifts sound files which is 98% of the bulk here.
2018-09-05 03:35:34 -05:00
Anewbe
4cebe1cfb9
Merge pull request #5541 from Atermonera/rotate_submap
...
Submaps can be rotated
2018-09-04 22:41:19 -05:00
Atermonera
6acab6f2bb
Merge pull request #5544 from Anewbe/grilles
...
Should fix another runtime with tools
2018-09-02 21:14:02 -07:00
atermonera
24c4c6dd9f
Ready for merge
2018-09-02 14:16:00 -07:00
Spades
8b7fbbe98c
Merge branch 'master' into upstream-merge-5424
2018-09-01 18:40:37 -04:00
Spades
af3df2f511
Merge pull request #4110 from VOREStation/upstream-merge-5455
...
[MIRROR] Added Squid plushies of varying colours
2018-09-01 18:25:21 -04:00
Anewbe
85a754480a
Should fix another runtime with tools
2018-08-31 22:14:15 -05:00
atermonera
2f9cebd38d
Submaps can now be rotated to any cardinal direction (South is default)
2018-08-31 01:32:26 -07:00
Mechoid
69ad0ce12b
Cult Girders are back to being proper.
2018-08-30 22:21:21 -07:00
Anewbe
f79a0cb9a6
Merge pull request #5527 from Mechoid/Neural_Implant
...
Adds a Neural implant for future implementation.
2018-08-30 23:23:32 -05:00
Mechoid
268d91ec02
Defines.
2018-08-28 21:48:14 -07:00
Mechoid
31761714b2
Adds a Neural implant for future implementation. Promethean brains have been updated to fit it.
2018-08-28 01:23:36 -07:00
Anewbe
9d8a19ab5d
Cleave changes, attack code cleanup
2018-08-27 01:18:49 -05:00
Atermonera
347c97326a
Appeases travis (Round 2)
2018-08-26 18:00:51 -07:00
Atermonera
0ce768af5a
Appeases travis (Round 1)
2018-08-26 17:43:52 -07:00
Atermonera
22d9c89a97
Merc blast door controller
2018-08-26 17:08:46 -07:00
Atermonera
63473cb903
Status display access
2018-08-26 17:08:46 -07:00
Atermonera
11d46f1d8c
Supply cartridge
2018-08-26 17:08:46 -07:00
atermonera
1f2c7cd9f6
Reorganize GPS to proper organization, important comments
2018-08-26 17:08:32 -07:00
atermonera
96d24e7427
GPS cartridge
2018-08-26 17:08:32 -07:00
atermonera
da45a40fad
Refactor crew manifest to a separate file
2018-08-26 17:08:31 -07:00
atermonera
849a3cba56
Cartridge work: part 2
...
* Power monitoring console
* Cartridges have persistent, internal data
* Code to load element-specific data upon request, instead of serving all relevant data at once
* Janitorial Supply Locator
2018-08-26 17:08:02 -07:00
atermonera
cce2201dd7
Cartridge work part 1
2018-08-26 17:08:02 -07:00
atermonera
84458be631
Med records, Sec records, Emp records
2018-08-26 17:07:39 -07:00
atermonera
32bca3d9b6
Template progress
2018-08-26 17:07:38 -07:00
atermonera
5cdeab7208
Cartridge devices
2018-08-26 17:06:53 -07:00
atermonera
3f6ec3e329
Adds newscast viewing, manifest
2018-08-26 17:06:15 -07:00
atermonera
1c8b408594
Initial Work: Manifest, Newsfeed
2018-08-26 17:06:14 -07:00
Anewbe
abe2f2c26a
Merge pull request #5519 from Mechoid/Mech_Equipment_Carepackage1
...
Mech Equipment Carepackage 1: Mainly Weapon Slots
2018-08-26 12:48:32 -05:00
Atermonera
de65c3c643
NanoUI now processes again
2018-08-25 21:13:16 -07:00
Mechoid
204b887ec9
Minifrags now use the small fragments mainly as they should.
2018-08-24 16:55:32 -07:00
Mechoid
bbeb578a7e
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into Mech_Equipment_Carepackage1
...
# Fix Conflicts:
# code/game/objects/items/weapons/grenades/explosive.dm
2018-08-24 16:05:35 -07:00
Atermonera
422bd2545c
Merge pull request #5516 from Anewbe/fragmentation
...
Adds a new subset of grenades that shoot projectiles
2018-08-24 15:47:01 -07:00
Mechoid
be703cee04
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into Mech_Equipment_Carepackage1
2018-08-23 20:17:49 -07:00
Mechoid
509addffdf
Adds a whole bunch of Exosuit weapons and other miscellaneous parts.
2018-08-23 20:14:56 -07:00
Atermonera
50efc3c01f
Merge pull request #5502 from Anewbe/glob_is_hungry_for_souls
...
Partially ports the GLOB system
2018-08-22 11:32:13 -07:00
Zap-zapper
b0a0a1e276
Protection from impersonation. Updated to 3700
2018-08-22 17:47:11 +07:00
Anewbe
4fc23e4051
Adds a new subset of grenades that shoot projectiles
2018-08-21 22:17:04 -05:00
Hawk_v3
fcc2f9aa79
Merge remote-tracking branch 'server/master'
2018-08-21 21:01:32 +01:00
Zap-zapper
02b58fdb99
Ghosts which joined soulcatcher can't be downloaded in Sleevemate
2018-08-20 23:45:17 +07:00
Repede
ba3584c965
Merge branch 'master' of https://github.com/VOREStation/VOREStation into self
...
# Conflicts:
# code/modules/mob/living/carbon/human/species/station/station.dm
# code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm
# code/modules/mob/living/silicon/robot/robot_modules/station.dm
# code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm
# config/custom_items.txt
# config/jobwhitelist.txt
2018-08-17 19:13:15 -04:00
Spades
16f5ea792b
Merge pull request #4091 from VOREStation/upstream-merge-5444
...
[MIRROR] Adds the Gigaphone, a suped-up Megaphone.
2018-08-17 16:13:10 -04:00
Spades
c1c7af946b
Merge pull request #4084 from VOREStation/upstream-merge-5441
...
[MIRROR] Fixes the PDA Halogen Scanner's tendency to be number one.
2018-08-17 16:12:24 -04:00
