50f8779fc0
Merge branch 'master' into upstream-merge-37486
2018-05-06 07:15:48 +00:00
d44b1b9b2e
Adds desc to vendor circuit board ( #37647 )
...
* FEED ME A STRAY CAT
* forgive me for I have web edited
* AAAAAHH
2018-05-05 17:54:54 -05:00
f387bb1694
Merge pull request #6633 from Citadel-Station-13/upstream-merge-37622
...
[MIRROR] Changes cockroach guts to insect guts
2018-05-05 09:40:11 -05:00
bdd613fa05
Merge pull request #6650 from Citadel-Station-13/upstream-merge-37659
...
[MIRROR] Crayons no longer use charge when used on a canvas
2018-05-05 09:35:01 -05:00
d5be66cf9a
Crayons no longer use charge when used on a canvas
2018-05-04 22:27:00 -05:00
f5031bc4f7
Fixes Several Machines Materials Insertion ( #37432 )
...
* Fixes Several Machines Materials Insertion
* attackby disable and show on examine fix
2018-05-04 04:40:56 -05:00
a351edea90
Merge pull request #6625 from Citadel-Station-13/upstream-merge-37414
...
[MIRROR] Removes stock market
2018-05-03 09:01:12 -05:00
deddd8debe
Merge pull request #37622 from ShizCalev/cockarock
...
Changes cockroach guts to insect guts
2018-05-03 08:42:46 -05:00
2702788dac
Removes stock market
2018-05-02 17:48:55 -05:00
5596472fc1
fixes midori cigs being empty ( #37615 )
2018-05-02 17:31:14 -05:00
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
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
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
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
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
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
fa5db57b56
Merge pull request #6600 from Citadel-Station-13/upstream-merge-37568
...
[MIRROR] Removes enriched uranium
2018-05-02 01:26:27 +00:00
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
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
4851b9bd82
Merge pull request #6559 from Citadel-Station-13/upstream-merge-37501
...
[MIRROR] Fixes missing icons
2018-05-02 01:19:58 +00:00
e26f1cd78b
Merge pull request #6553 from Citadel-Station-13/upstream-merge-37165
...
[MIRROR] NTNet improvements!
2018-05-02 01:17:10 +00:00
d47b71cf23
Merge pull request #37475 from 81Denton/OH-YEAH-BROTHER
...
H.O.G.A.N. lawset
2018-05-01 15:40:09 -05:00
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
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
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
1675490652
Modifies component transfer to make ChangeTurf able to transfer components
2018-04-30 21:16:48 -05:00
c4d461f3be
Merge pull request #37568 from pigeonsk/removeenruranium
...
Removes enriched uranium
2018-04-30 21:15:35 -05:00
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
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
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
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
3fc7b4ca3b
Merge pull request #37577 from kevinz000/patch-495
...
Removes a duplicate comsig I accidently added
2018-04-30 09:32:58 -05:00
987cce76ed
[s] Small tweaks and fixes a edgecase with machine construction ( #37494 )
...
* Puts back required time for the emitter and field_generator and also removes a certain issue that certain people were causing
* Couple of things I missed
* I noticed the error with regards to atom and changed to obj like I was trying to originally. Also its fine to build on tables that wasnt the issue with this specific aspect.
* Edge windows. We need those.
* optimised the checks to be behind a if check for when you are actually needing to make something for the floor...
* Corrects a input proc by request
* Working is not my strong suit.
2018-04-30 05:00:24 -05:00
665bd35f78
Merge pull request #37499 from ShizCalev/bikehorn-fix
...
Fixes bikehorn mood event
2018-04-30 04:55:47 -05:00
a705b2c31c
Adds a cooldown to PDA send to all messages. ( #37422 )
...
* Adds a cooldown to PDA send to all messages.
* aaa
aaa
* forgot this one
* condom
2018-04-30 01:08:03 -05:00
3369c804b2
Kills off /obj/item/device ( #6561 )
2018-04-30 00:06:58 -05:00
0a02d1cb13
Deactivate suicide prescans via ghost var
2018-04-29 21:33:56 -05:00
07bbc4d3af
Actually links mineral sprites with their new location ( #37564 )
...
Fixes sprites being broken
2018-04-29 19:06:14 -05:00
2ca75d7de7
added fly and moth categories to limb grower and limbgrower_designs.dm ( #37349 )
...
only human and lizard synthetic limbs will have should_draw_greyscale set to true
added /improper and uncapitalised synthetic limb names
removed plasmaman parts from human_parts_greyscale.dmi
2018-04-29 17:52:44 -05:00
6f13d2c2e9
Merge pull request #6546 from Citadel-Station-13/upstream-merge-37380
...
[MIRROR] Refactors and fixes RPEDs
2018-04-29 22:45:28 +00:00
814dc3f811
fixes a pacifism kill through crushing firelocks! ( #37511 )
...
* fix!
* ORANGES LOOK AWAY
* thanks maintainer
2018-04-29 10:09:29 -05:00
c287c3a84c
Merge pull request #6548 from Citadel-Station-13/upstream-merge-37483
...
[MIRROR] Fixes obj descs and adds missing ones
2018-04-29 02:29:44 -05:00
71b362e41e
Merge pull request #6547 from Citadel-Station-13/upstream-merge-37473
...
[MIRROR] Lets quantum pads be used by sillycones properly.
2018-04-29 02:29:05 -05:00
f606430d2b
Merge pull request #6545 from Citadel-Station-13/upstream-merge-37478
...
[MIRROR] [s] Fixes turret exploits
2018-04-29 02:28:14 -05:00
53ee2ab0a9
Merge pull request #6543 from Citadel-Station-13/upstream-merge-37465
...
[MIRROR] Adds logging for PDA explosions
2018-04-29 02:25:10 -05:00
db142667b7
Merge pull request #37501 from ShizCalev/icon-fixes
...
Fixes missing icons
2018-04-28 14:54:45 -05:00
803d3b59fd
Merge pull request #6556 from Citadel-Station-13/upstream-merge-37497
...
[MIRROR] Replaces a / with * as per Contributing.md [bscrystal.dm]
2018-04-28 14:07:24 -05:00
b565ef9171
Merge pull request #6557 from Citadel-Station-13/upstream-merge-37384
...
[MIRROR] Re-adds and reworks fusion.
2018-04-28 14:07:08 -05:00
3f6167d08e
Moves several clothing-specific flags from /atom to their proper type
2018-04-28 13:21:48 -05:00
811cc06188
Merge pull request #6536 from Citadel-Station-13/upstream-merge-37436
...
[MIRROR] Adds a stationloving component to replace a couple of flags and SSinbounds with
2018-04-28 01:36:04 -05:00
deathride58