deathride58
|
f35bfa22e4
|
Merge pull request #6614 from Citadel-Station-13/upstream-merge-37475
[MIRROR] H.O.G.A.N. lawset
|
2018-05-02 01:33:19 +00:00 |
|
deathride58
|
9151a80461
|
Merge pull request #6613 from Citadel-Station-13/upstream-merge-37590
[MIRROR] Reorganizes cargo's big "miscellaneous supplies" category
|
2018-05-02 01:32:40 +00:00 |
|
deathride58
|
4d44701ee5
|
Merge pull request #6612 from Citadel-Station-13/upstream-merge-37580
[MIRROR] Craftable HUDsunglasses
|
2018-05-02 01:32:01 +00:00 |
|
deathride58
|
5c40a38457
|
Merge pull request #6609 from Citadel-Station-13/upstream-merge-37584
[MIRROR] Readds missing nuked narsie cinematic.
|
2018-05-02 01:30:19 +00:00 |
|
deathride58
|
a84f5c5328
|
Merge pull request #6608 from Citadel-Station-13/upstream-merge-37516
[MIRROR] Changes the trauma formula so constant small ticks don't keep triggering traumas
|
2018-05-02 01:30:00 +00:00 |
|
deathride58
|
f248685db2
|
Merge pull request #6607 from Citadel-Station-13/upstream-merge-37579
[MIRROR] Fix placing boxes in storage implants
|
2018-05-02 01:29:41 +00:00 |
|
deathride58
|
084f2ac1da
|
Merge pull request #6606 from Citadel-Station-13/upstream-merge-37593
[MIRROR] Revert "fixes a pacifism kill through crushing firelocks! (#37511)"
|
2018-05-02 01:29:15 +00:00 |
|
deathride58
|
a4b48cdc53
|
Merge pull request #6604 from Citadel-Station-13/upstream-merge-37562
[MIRROR] Fix runtimes in corpse code due to mob_spawners becoming null
|
2018-05-02 01:28:05 +00:00 |
|
deathride58
|
2b8e734488
|
Merge pull request #6603 from Citadel-Station-13/upstream-merge-37560
[MIRROR] Fix mecha maintenance protocol button always saying Initiate
|
2018-05-02 01:27:51 +00:00 |
|
deathride58
|
f49c9d7e3d
|
Merge pull request #6602 from Citadel-Station-13/upstream-merge-37561
[MIRROR] Fixes loading custom aways.
|
2018-05-02 01:27:26 +00:00 |
|
deathride58
|
fa5db57b56
|
Merge pull request #6600 from Citadel-Station-13/upstream-merge-37568
[MIRROR] Removes enriched uranium
|
2018-05-02 01:26:27 +00:00 |
|
deathride58
|
2760c61720
|
Merge pull request #6599 from Citadel-Station-13/upstream-merge-37572
[MIRROR] Fixes the intergalactic stock market crash by removing the speculation/performance modifier
|
2018-05-02 01:26:05 +00:00 |
|
deathride58
|
8f00bca017
|
Merge pull request #6598 from Citadel-Station-13/upstream-merge-37477
[MIRROR] Makes dizziness work again
|
2018-05-02 01:25:46 +00:00 |
|
deathride58
|
9c1a4303f9
|
Merge pull request #6597 from Citadel-Station-13/upstream-merge-37510
[MIRROR] Circuits can't throw themselves
|
2018-05-02 01:25:23 +00:00 |
|
deathride58
|
d26ba53e91
|
Merge pull request #6596 from Citadel-Station-13/upstream-merge-37513
[MIRROR] Adds traits for a character's preference towards pineapples.
|
2018-05-02 01:25:04 +00:00 |
|
deathride58
|
ea5725cc4e
|
Merge pull request #6595 from Citadel-Station-13/upstream-merge-37549
[MIRROR] Resolved var name conflict for bounce_away()
|
2018-05-02 01:24:36 +00:00 |
|
deathride58
|
7d01eeeb35
|
Merge pull request #6593 from Citadel-Station-13/upstream-merge-37556
[MIRROR] More holosigns for techwebs
|
2018-05-02 01:23:19 +00:00 |
|
deathride58
|
dca50e5d35
|
Merge pull request #6575 from Citadel-Station-13/upstream-merge-37349
[MIRROR] Adds fly and moth categories to limb grower
|
2018-05-02 01:21:37 +00:00 |
|
deathride58
|
4851b9bd82
|
Merge pull request #6559 from Citadel-Station-13/upstream-merge-37501
[MIRROR] Fixes missing icons
|
2018-05-02 01:19:58 +00:00 |
|
deathride58
|
97ad0f39a7
|
Merge pull request #6552 from Citadel-Station-13/upstream-merge-37081
[MIRROR] adds new changeling var that counts actual absorbs, uses it for Spiders ability
|
2018-05-02 01:17:58 +00:00 |
|
deathride58
|
e26f1cd78b
|
Merge pull request #6553 from Citadel-Station-13/upstream-merge-37165
[MIRROR] NTNet improvements!
|
2018-05-02 01:17:10 +00:00 |
|
deathride58
|
e8f4602716
|
Update implant.dm
|
2018-05-01 21:16:05 -04:00 |
|
Jordan Brown
|
d47b71cf23
|
Merge pull request #37475 from 81Denton/OH-YEAH-BROTHER
H.O.G.A.N. lawset
|
2018-05-01 15:40:09 -05:00 |
|
Jordan Brown
|
dc9ce0cc6f
|
Merge pull request #37590 from 81Denton/cargo-categories
Reorganizes cargo's big "miscellaneous supplies" category
|
2018-05-01 15:37:54 -05:00 |
|
Jordan Brown
|
56bc188abb
|
Merge pull request #37580 from 81Denton/craftable-hudsunglasses
Craftable HUDsunglasses
|
2018-05-01 15:35:22 -05:00 |
|
AnturK
|
76302a217e
|
Readds missing nuked narsie cinematic. (#37584)
|
2018-05-01 11:05:16 -05:00 |
|
Jordan Brown
|
453bd38ca5
|
Merge pull request #37516 from XDTM/LinearBrainDamage
Changes the trauma formula so constant small ticks don't keep triggering traumas
|
2018-05-01 09:56:39 -05:00 |
|
Tad Hardesty
|
34321883cc
|
Fix placing boxes in storage implants
|
2018-05-01 07:30:07 -05:00 |
|
LetterJay
|
7add247144
|
Merge pull request #6592 from Citadel-Station-13/upstream-merge-37554
[MIRROR] Adds some more reagents to clogged vents
|
2018-04-30 22:37:37 -05:00 |
|
LetterJay
|
154ab5022b
|
Merge pull request #6576 from Citadel-Station-13/upstream-merge-37564
[MIRROR] Actually links mineral sprites with their new location
|
2018-04-30 22:34:53 -05:00 |
|
Jordan Brown
|
a3ca01f158
|
Merge pull request #37593 from optimumtact/revertarmshit
Revert "fixes a pacifism kill through crushing firelocks! (#37511)"
|
2018-04-30 21:20:43 -05:00 |
|
Jordan Brown
|
d9c368a2a4
|
Merge pull request #37562 from AutomaticFrenzy/patch/corpse-runtimes
Fix runtimes in corpse code due to mob_spawners becoming null
|
2018-04-30 21:19:22 -05:00 |
|
Jordan Brown
|
63e03413b2
|
Merge pull request #37560 from AutomaticFrenzy/patch/terminate-maintenace-protocols
Fix mecha maintenance protocol button always saying Initiate
|
2018-04-30 21:19:14 -05:00 |
|
Jordan Brown
|
da2ea729ee
|
Merge pull request #37561 from AnturK/customloadingfix
Fixes loading custom aways.
|
2018-04-30 21:19:05 -05:00 |
|
Jordan Brown
|
c4d461f3be
|
Merge pull request #37568 from pigeonsk/removeenruranium
Removes enriched uranium
|
2018-04-30 21:15:35 -05:00 |
|
Jordan Brown
|
c869ad12bd
|
Merge pull request #37572 from deathride58/fixesdepression
Fixes the intergalactic stock market crash by removing the speculation/performance modifier
|
2018-04-30 21:14:22 -05:00 |
|
Alomga
|
90ecbf6bb9
|
Makes dizziness work again
|
2018-04-30 13:38:12 -05:00 |
|
Jordan Brown
|
9c9b2feefc
|
Merge pull request #37510 from JJRcop/throw_myself
Circuits can't throw themselves
|
2018-04-30 13:04:19 -05:00 |
|
Jordan Brown
|
12eb6a8a97
|
Merge pull request #37513 from ShizCalev/pineapple-memes
Adds traits for a character's preference towards pineapples.
|
2018-04-30 13:02:05 -05:00 |
|
Jordan Brown
|
a9d452a24d
|
Merge pull request #37549 from ShizCalev/bounce_away-fixes
Resolved var name conflict for bounce_away()
|
2018-04-30 12:51:40 -05:00 |
|
Jordan Brown
|
bf0fe93f35
|
Merge pull request #37556 from 81Denton/techweb-sunglasses
More holosigns for techwebs
|
2018-04-30 12:48:12 -05:00 |
|
Jordan Brown
|
8f1bb462ad
|
Merge pull request #37554 from DaxDupont/vents
Adds some more reagents to clogged vents
|
2018-04-30 12:46:58 -05:00 |
|
LetterJay
|
7205a15ef7
|
Merge pull request #6591 from Citadel-Station-13/upstream-merge-37577
[MIRROR] Removes a duplicate comsig I accidently added
|
2018-04-30 11:06:19 -05:00 |
|
LetterJay
|
94bebc33a0
|
Merge pull request #6590 from Citadel-Station-13/upstream-merge-37494
[MIRROR] [s] Small tweaks and fixes a edgecase with machine construction
|
2018-04-30 11:03:33 -05:00 |
|
LetterJay
|
34ce5380d6
|
Merge pull request #6589 from Citadel-Station-13/upstream-merge-37500
[MIRROR] Removed /obj/item/asteroid path
|
2018-04-30 11:03:16 -05:00 |
|
LetterJay
|
372e363257
|
Merge pull request #6588 from Citadel-Station-13/upstream-merge-37437
[MIRROR] Fixes circuits being able to detect ghosts and fix pinless guns
|
2018-04-30 11:02:58 -05:00 |
|
LetterJay
|
a082da66f3
|
Merge pull request #6587 from Citadel-Station-13/upstream-merge-37499
[MIRROR] Fixes bikehorn mood event
|
2018-04-30 11:02:36 -05:00 |
|
LetterJay
|
fcb1261c13
|
Merge pull request #6586 from Citadel-Station-13/upstream-merge-37503
[MIRROR] Fixes Blast Cannon
|
2018-04-30 11:02:16 -05:00 |
|
LetterJay
|
6885655022
|
Merge pull request #6585 from Citadel-Station-13/upstream-merge-37544
[MIRROR] Adds a 2.5 second fire delay to beam rifles
|
2018-04-30 10:21:06 -05:00 |
|
LetterJay
|
794d078dff
|
Merge pull request #6584 from Citadel-Station-13/upstream-merge-37489
[MIRROR] [s] Fixes the fryer shrinking the size of objects
|
2018-04-30 10:20:53 -05:00 |
|