Robustin
786c26fa97
Ratvar will now bitchslap BOH babies ( #33159 )
...
* Singuloproofing Reebe
* Message reformatted
* Inconsistent Indentification
* user is now living so we can knock them down
2017-12-01 11:58:30 -06:00
deathride58
32f694943b
Merge pull request #4150 from Citadel-Station-13/upstream-merge-32965
...
[MIRROR] Removes mass-spectrometers
2017-11-30 04:45:13 +00:00
deathride58
9458087cfa
Update scanners.dm
2017-11-28 22:31:54 -05:00
ShizCalev
47e0943c9c
Fixes twohanded weapons showing outdated icons ( #33127 )
2017-11-28 19:04:09 -06:00
ACCount
f089b9ca2d
Removes mass-spectrometers
2017-11-28 06:27:55 -06:00
deathride58
c8022e2764
Merge pull request #4145 from Citadel-Station-13/upstream-merge-33099
...
[MIRROR] Allows toolbelts to carry geiger counters
2017-11-27 20:39:35 +00:00
Leo
5b45f66677
Merge pull request #33099 from jughu/Powercreep-till-the-end
...
Allows toolbelts to carry geiger counters
2017-11-27 08:20:18 -06:00
uraniummeltdown
2d0f8d9482
Stack Recipe Lists ( #33081 )
...
* ports baycode stack_recipe_list
comfy and office chairs use stack recipe lists
* removed some src. and made list_recipes() into interact()
* /datum/browser for stack menus
* revert unnecessary edit
2017-11-27 06:17:18 -06:00
deathride58
9e0aac69f3
Merge pull request #4136 from Citadel-Station-13/upstream-merge-33034
...
[MIRROR] More integrated circuit fixes and code improvements
2017-11-27 05:17:50 +00:00
deathride58
c9211bca16
Update multitool.dm
2017-11-26 21:36:10 -05:00
ShizCalev
5abd1bcdd9
Cleans up some qdel(src)'s in Initialize()
2017-11-26 20:15:18 -06:00
ACCount
0be326633d
More integrated circuit fixes and code improvements
2017-11-26 04:56:44 -06:00
deathride58
186bcf6ef4
Update laserpointer.dm
2017-11-24 19:03:25 -05:00
Dorsisdwarf
6dea43c709
Advanced Laserpointer Feline Interaction
2017-11-24 17:56:58 -06:00
deathride58
f92bc0c938
Merge pull request #4098 from Citadel-Station-13/upstream-merge-32805
...
[MIRROR] Refactor on_reagent_change to pass through the change type
2017-11-24 23:47:13 +00:00
deathride58
837779b683
Merge pull request #4109 from Citadel-Station-13/upstream-merge-33025
...
[MIRROR] Fixes Lord Singuloth hungering for more than he should
2017-11-24 23:15:09 +00:00
ShizCalev
2762e3b530
Fixes Lord Singuloth hungering for more than he should
2017-11-24 13:00:42 -06:00
Tad Hardesty
9806de310d
Remove NODROP from water tank misters ( #32995 )
2017-11-24 12:59:25 -06:00
oranges
c43591982a
Refactor on_reagent_change to pass through the change type
2017-11-24 12:59:09 -06:00
ACCount
2147c60b7f
Replaces "console screen" stock part with glass sheets
2017-11-23 18:53:47 -06:00
deathride58
c76cacdf77
Merge pull request #4081 from Citadel-Station-13/upstream-merge-32914
...
[MIRROR] [READY]NTnet refactor, assimilates exonet
2017-11-23 01:40:54 +00:00
deathride58
435ac739fc
Update machine_circuitboards.dm
2017-11-22 20:09:18 -05:00
LetterJay
eba36e48f9
Merge pull request #3984 from Citadel-Station-13/upstream-merge-32188
...
[MIRROR] JSON feedback
2017-11-22 18:42:34 -06:00
oranges
c2c22d56c7
[READY]NTnet refactor, assimilates exonet
2017-11-22 15:52:54 -06:00
deathride58
d86bdf2150
Update trash.dm
2017-11-22 14:44:09 -05:00
ShizCalev
6ab499b57b
Fixes bartender suit having an adjust state
2017-11-22 12:40:32 -06:00
deathride58
1f6b3ce629
Merge branch 'master' into upstream-merge-32188
2017-11-21 19:53:58 +00:00
ACCount
8a64287249
Integrated circuit fixes and code improvements
2017-11-21 03:04:17 -06:00
deathride58
d2b251d23c
Merge pull request #4041 from Citadel-Station-13/upstream-merge-32844
...
[MIRROR] Cleans up unused code
2017-11-21 04:15:11 +00:00
deathride58
8249c89cc0
Merge pull request #4040 from Citadel-Station-13/upstream-merge-32905
...
[MIRROR] Adds AI lawset spawners (mapping helpers)
2017-11-21 03:25:55 +00:00
Jordan Brown
2498e1ddc0
Cleans up unused code
2017-11-20 10:14:32 -06:00
Jordan Brown
212071e075
Adds AI lawset spawners (mapping helpers)
2017-11-20 10:12:17 -06:00
ShizCalev
831dde525e
Makes drinking glasses smash when thrown
2017-11-20 02:45:22 -06:00
Jordie
2bf7b45919
Merge pull request #32880 from vuonojenmustaturska/chameleonprojfix
...
Fixes vehicles & chameleon projector
2017-11-19 22:39:14 -06:00
deathride58
1d841ce65a
Merge pull request #3994 from Citadel-Station-13/upstream-merge-32736
...
[MIRROR] RPD ui improvements
2017-11-18 05:40:13 +00:00
deathride58
eeba86e27e
Merge branch 'master' into upstream-merge-32188
2017-11-18 05:31:42 +00:00
duncathan salt
52fc5e8bc6
RPD ui improvements
2017-11-17 18:03:56 -06:00
Jordie
b7e99a7448
JSON feedback
2017-11-17 01:44:12 -06:00
vuonojenmustaturska
6ce69fb2c8
Replaces a bunch of mob loops with hopefully better ones
2017-11-16 16:09:15 -06:00
deathride58
f6e4e77b80
Merge pull request #3962 from Citadel-Station-13/upstream-merge-32743
...
[MIRROR] Fixes pipe dispensers being unable to dispense bent pipes
2017-11-16 17:26:18 +00:00
ACCount
1b9280776e
Fixes pipe dispensers being unable to dispense bent pipes ( #32743 )
...
* Fixes pipe dispensers not dispensing bent pipes
* Updates meter RPD icon file to the one that's actually used
2017-11-15 19:12:34 -06:00
AutomaticFrenzy
cb7d45c980
actually use disable_warning mob_can_equip ( #32750 )
2017-11-15 19:07:01 -06:00
CitadelStationBot
e83b175f30
Merge pull request #3953 from Citadel-Station-13/upstream-merge-32729
...
[MIRROR] removes an unused var from radio code
2017-11-15 11:05:19 -06:00
LetterJay
163ef812fb
Merge pull request #3945 from Citadel-Station-13/upstream-merge-32702
...
[MIRROR] Minor speedups to movement: First Blood Part 2
2017-11-15 10:41:16 -06:00
LetterJay
16019df886
Merge branch 'master' into upstream-merge-32280
2017-11-15 10:21:04 -06:00
oranges
156aa30c61
Merge pull request #32729 from Qustinnus/cheapGBP
...
removes an unused var from radio code
2017-11-15 01:27:24 -06:00
LetterJay
62c7cfc4e7
Merge pull request #3938 from Citadel-Station-13/upstream-merge-32689
...
[MIRROR] Fixes a bunch of hand tele/portal issues.
2017-11-14 15:56:08 -06:00
vuonojenmustaturska
8136148303
Minor speedups to movement: First Blood Part 2
2017-11-14 15:00:45 -06:00
kevinz000
eba429f5b1
Hand teleporter and portal fixes. ( #32689 )
2017-11-14 13:11:55 -06:00
LetterJay
8868a354b6
Update multitool.dm
2017-11-14 13:06:43 -06:00
