LetterJay
|
71e7b461d5
|
Merge pull request #6623 from Citadel-Station-13/upstream-merge-37615
[MIRROR] Fixes Midori cigs having no nicotine
|
2018-05-03 08:52:46 -05:00 |
|
CitadelStationBot
|
1eadb0a838
|
Fixes Midori cigs having no nicotine
|
2018-05-02 17:31:14 -05:00 |
|
Mickyan
|
5596472fc1
|
fixes midori cigs being empty (#37615)
|
2018-05-02 17:31:14 -05:00 |
|
deathride58
|
e42cce26da
|
Merge pull request #6619 from Citadel-Station-13/upstream-merge-37538
[MIRROR] Animated Spellbooks
|
2018-05-02 17:33:41 +00:00 |
|
deathride58
|
184441eb38
|
Merge pull request #6078 from Commandersand/LOADOUT
MORE LOADOUT STUFF
|
2018-05-02 17:29:44 +00:00 |
|
CitadelStationBot
|
9f8f630653
|
Animated Spellbooks
|
2018-05-02 10:35:57 -05:00 |
|
Nabski89
|
b71e8718eb
|
Animated Spellbooks (#37538)
|
2018-05-02 10:35:57 -05:00 |
|
deathride58
|
9a5fd92fb4
|
Merge pull request #6491 from Citadel-Station-13/upstream-merge-37343
[MIRROR] Adds more roundstart tips
|
2018-05-02 14:29:06 +00:00 |
|
deathride58
|
c3a58dbc2a
|
Merge branch 'master' into upstream-merge-37343
|
2018-05-02 14:28:53 +00:00 |
|
deathride58
|
5098e0db21
|
Merge pull request #6490 from Citadel-Station-13/upstream-merge-37381
[MIRROR] Fixes toolbelts holding everything
|
2018-05-02 14:27:25 +00:00 |
|
deathride58
|
f5cbfd1c52
|
Merge pull request #6577 from Citadel-Station-13/upstream-merge-36839
[MIRROR] Deactivate suicide prescans via ghost var
|
2018-05-02 14:25:32 +00:00 |
|
deathride58
|
d2804694e0
|
Merge pull request #6618 from Citadel-Station-13/upstream-merge-37606
[MIRROR] Corrects mistake in storage implant uplink description
|
2018-05-02 14:25:14 +00:00 |
|
deathride58
|
711f309c46
|
Update suicide.dm
|
2018-05-02 10:01:47 -04:00 |
|
deathride58
|
55566461c6
|
Merge pull request #6601 from Citadel-Station-13/upstream-merge-37565
[MIRROR] Modifies component transfer to make ChangeTurf able to transfer components
|
2018-05-02 13:59:14 +00:00 |
|
deathride58
|
d7c709f5a6
|
Merge pull request #6616 from Citadel-Station-13/upstream-merge-37035
[MIRROR] Splits APC attackbys into tool acts, removes some old parts that do nothing and allows crowbars to remove the cell too
|
2018-05-02 13:58:29 +00:00 |
|
CitadelStationBot
|
421379ea76
|
Corrects mistake in storage implant uplink description
|
2018-05-02 08:38:10 -05:00 |
|
Jordan Brown
|
0a0875e447
|
Merge pull request #37606 from ShizCalev/storage-implant-uplink-description
Corrects mistake in storage implant uplink description
|
2018-05-02 08:38:09 -05:00 |
|
CitadelStationBot
|
b23230293e
|
Splits APC attackbys into tool acts, removes some old parts that do nothing and allows crowbars to remove the cell too
|
2018-05-02 01:32:34 -05:00 |
|
vuonojenmustaturska
|
49150c542f
|
Splits APC attackbys into tool acts, removes some old parts that do nothing and allows crowbars to remove the cell too (#37035)
* APC crap
* moar define
* honk
* cover defines
|
2018-05-02 01:32:34 -05:00 |
|
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
|
5f6673ca4d
|
Merge pull request #6605 from Citadel-Station-13/upstream-merge-37570
[MIRROR] Fixes mapping issue on deltastation
|
2018-05-02 01:28:34 +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
|
613fadf057
|
Update _concrete.dm
|
2018-05-01 21:27:01 -04: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
|
dd5669d752
|
Update suicide.dm
|
2018-05-01 21:22:42 -04: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
|
9c41fd5516
|
Merge pull request #6566 from Citadel-Station-13/upstream-merge-37528
[MIRROR] Sprite reorganizing, minor sprite fix for mineral stacks
|
2018-05-02 01:19:11 +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 |
|
CitadelStationBot
|
14a0901bd7
|
H.O.G.A.N. lawset
|
2018-05-01 15:40:09 -05: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 |
|
CitadelStationBot
|
e2a4524b5b
|
Reorganizes cargo's big "miscellaneous supplies" category
|
2018-05-01 15:37:54 -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 |
|
CitadelStationBot
|
7bb7852b77
|
Craftable HUDsunglasses
|
2018-05-01 15:35:22 -05:00 |
|