f581b2d94d
Makes the decal component handle updating inventory icons
2018-01-02 15:18:31 -06:00
943388d8f4
Merge pull request #4367 from Citadel-Station-13/upstream-merge-33463
...
[MIRROR] Adds blob roundend report.
2018-01-02 14:56:12 -06:00
b3eb85cdd2
Merge pull request #4633 from Citadel-Station-13/upstream-merge-34035
...
[MIRROR] Puts back the changeturf part of PlaceOnTop()
2018-01-02 08:02:02 -06:00
b49009d481
Merge pull request #4454 from Citadel-Station-13/upstream-merge-33621
...
[MIRROR] removes silly garbage defines
2018-01-02 04:52:57 -06:00
18f5e1095a
Merge pull request #34035 from ninjanomnom/actually-changeturf
...
Puts back the changeturf part of PlaceOnTop()
2018-01-02 00:12:32 -06:00
3ee2569379
Update borer_event.dm
2018-01-01 14:07:17 -06:00
5486f71010
woo
2018-01-01 07:30:50 -06:00
168519c328
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-32311
2018-01-01 07:00:34 -06:00
7d4a51f659
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33463
2018-01-01 04:36:29 -06:00
3a8f27a2bf
Merge pull request #4623 from Citadel-Station-13/upstream-merge-33960
...
[MIRROR] Corrects flamethrower capitalization
2017-12-31 15:23:14 -06:00
54032f9c6d
Merge pull request #33960 from ShizCalev/flamer
...
Corrects flamethrower capitalization
2017-12-31 10:02:59 -06:00
4e0efc64d5
Merge pull request #33957 from ninjanomnom/helper-cleanup
...
cleans up some behaviour for PlaceOnTop/Bottom
2017-12-31 10:01:46 -06:00
7a6cf002d3
Revert "[MIRROR] Fix PDA message photos not being viewable"
2017-12-31 06:41:03 -06:00
d8e85b5f15
Merge pull request #4613 from Citadel-Station-13/upstream-merge-33945
...
[MIRROR] Improves loot drop spawners, adds AI law spawners to cores
2017-12-31 02:52:44 -06:00
88df151bd7
Merge pull request #4612 from Citadel-Station-13/upstream-merge-33947
...
[MIRROR] Last resort now requires a confirmation.
2017-12-31 02:52:29 -06:00
515c4a0472
Merge pull request #4611 from Citadel-Station-13/upstream-merge-33940
...
[MIRROR] Fix PDA message photos not being viewable
2017-12-31 02:52:03 -06:00
7998f037bd
Merge pull request #4609 from Citadel-Station-13/upstream-merge-33580
...
[MIRROR] Some modest clockcult balancing - vitality matrices, brass skewers, pressure sensors
2017-12-31 02:51:44 -06:00
503f8e2635
Merge pull request #4605 from Citadel-Station-13/upstream-merge-33805
...
[MIRROR] Fixed autolathes and ore redemption machines leaving things at previous shuttle locations
2017-12-31 02:50:21 -06:00
9dd9d9413a
Improves loot drop spawners, adds AI law spawners to cores ( #33945 )
...
* hymn to breaking strain
* remove subtypes as requested
* no-one saw that
2017-12-31 02:27:12 -06:00
9c8959f2ff
Last resort now requires a confirmation. ( #33947 )
...
* Update headcrab.dm
* fixed
* fuck
* Update headcrab.dm
* Update headcrab.dm
2017-12-31 02:24:53 -06:00
38870f4056
Fix PDA message photos not being viewable
2017-12-30 21:27:31 -06:00
3208404f14
Merge pull request #33580 from Xhuis/defenses_balancing
...
Some modest clockcult balancing - vitality matrices, brass skewers, pressure sensors
2017-12-30 16:59:07 -06:00
4237a8910c
Merge pull request #4483 from Citadel-Station-13/upstream-merge-33682
...
[MIRROR] Makes newscaster feedback messages and comments always a list.
2017-12-30 14:13:03 -06:00
3802cf8586
Merge pull request #33805 from Cruix/shuttle_machines
...
Fixed autolathes and ore redemption machines leaving things at previous shuttle locations
2017-12-30 13:56:43 -06:00
dae3c3efb5
Merge branch 'master' into upstream-merge-33621
2017-12-30 13:23:39 -06:00
8452cc74d0
Update newscaster.dm
2017-12-30 13:21:31 -06:00
b260704381
Merge pull request #4530 from Citadel-Station-13/upstream-merge-33705
...
[MIRROR] Turns the baseturf var into a part time list
2017-12-30 13:19:00 -06:00
f860fa0cd3
Update closed.dm
2017-12-30 05:12:10 -06:00
19c6db6a6e
Merge pull request #4591 from Citadel-Station-13/upstream-merge-33905
...
[MIRROR] Fixes being able to adjust jumpsuits without an adjust state w/ chameleon & random jumpsuit
2017-12-30 05:06:03 -06:00
4599680f68
Merge pull request #4580 from Citadel-Station-13/upstream-merge-33842
...
[MIRROR] Internal radio implant
2017-12-30 05:03:48 -06:00
2d9a70a487
Update uplink_kits.dm
2017-12-29 18:42:44 -06:00
a3ebaa5de8
Merge branch 'master' into upstream-merge-32311
2017-12-29 18:38:50 -06:00
d38a4a2aa5
Merge pull request #33905 from ShizCalev/jumpsuit-fix
...
Fixes being able to adjust jumpsuits without an adjust state w/ chameleon & random jumpsuit
2017-12-29 10:10:30 -06:00
a56882556b
Update _eminence.dm
2017-12-29 07:36:03 -06:00
a64a1e4a5c
Merge branch 'master' into upstream-merge-33783
2017-12-29 06:49:47 -06:00
e17f9fdc07
Merge pull request #4586 from Citadel-Station-13/upstream-merge-33895
...
[MIRROR] Corrects abductor uncuffing message
2017-12-29 06:47:56 -06:00
80ce187d3d
Merge pull request #4583 from Citadel-Station-13/upstream-merge-33873
...
[MIRROR] The Radiance (eminence after ratvar awakens) can now ignore chapel tiles
2017-12-29 06:26:06 -06:00
0f328e22b2
Merge pull request #4574 from Citadel-Station-13/upstream-merge-33558
...
[MIRROR] Dead cultists can now cross Reebe's "Servant Blocker"
2017-12-29 06:24:09 -06:00
b13d4dd721
Merge pull request #4572 from Citadel-Station-13/upstream-merge-33807
...
[MIRROR] Made atoms not smooth with shuttles
2017-12-29 06:23:12 -06:00
f093bb8fec
Merge pull request #4570 from Citadel-Station-13/upstream-merge-33856
...
[MIRROR] Fixes AI eyes getting nullspaced when jumping to deleted cameras
2017-12-29 06:22:35 -06:00
bbaee9f3d7
Merge pull request #4568 from Citadel-Station-13/upstream-merge-33880
...
[MIRROR] Fixes wall CanPass
2017-12-29 06:22:13 -06:00
c7db4e8310
also syncs a bunch of shit
2017-12-29 04:12:43 -06:00
6eabea6a71
Corrects abductor uncuffing message ( #33895 )
...
* Corrects abductor uncuffing message
* breaks
2017-12-29 02:56:30 -06:00
07ba4e8189
The Radiance (eminence after ratvar awakens) can now ignore chapel tiles ( #33873 )
2017-12-29 02:55:03 -06:00
866318e33e
Internal radio implant
2017-12-29 02:52:24 -06:00
518b264654
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33783
...
# Conflicts:
# _maps/map_files/generic/CentCom.dmm
# code/modules/mob/living/living.dm
2017-12-29 01:34:17 -06:00
a9a94f7aed
Dead cultists can now cross Reebe's "Servant Blocker" ( #33558 )
...
* Dead Cultist Exception
* Servant blocker update
* Corpse balance
* Lets corpses pass servant blocker
* Lets cult corpses pass servant blocker
* Update servant_blocker.dm
* Update open.dm
* Update servant_blocker.dm
* Update open.dm
2017-12-29 00:29:19 -06:00
ab408d3e97
Made atoms not smooth with shuttles ( #33807 )
...
* Made atoms not smooth with shuttles
* Shuttle area canSmoothWithAreas is automatically assigned to the area's type if it is null
* Moved pirate shuttle areas into the multi-area shuttles section
2017-12-29 00:29:04 -06:00
6fac704a4f
Fixes AI eyes getting nullspaced when jumping to deleted cameras ( #33856 )
2017-12-29 00:28:47 -06:00
fbdf24ddd4
Fixes wall CanPass ( #33880 )
2017-12-29 00:28:32 -06:00
Emmett Gaines