deathride58
3bff5f4cd6
Update PDA_types.dm
2017-12-05 17:43:52 -05:00
Jordan Brown
e1f658a50d
Removes ComponentActivated in favor of callbacks
2017-12-05 15:42:47 -06:00
deathride58
a6aa181161
Merge pull request #4225 from Citadel-Station-13/upstream-merge-33124
...
[MIRROR] Moves some machine sprites into /machines/ folder
2017-12-05 20:37:30 +00:00
ACCount
435e46e407
Moves some machine sprites into /machines/ folder
2017-12-05 03:24:03 -06:00
oranges
4204c889ed
Merge pull request #32964 from AutomaticFrenzy/patch/joules
...
Measure energy values in joules
2017-12-05 03:23:06 -06:00
deathride58
379f73d1e1
Merge branch 'master' into upstream-merge-32249
2017-12-04 23:15:38 +00:00
deathride58
21d5e8999c
Merge branch 'master' into upstream-merge-32624
2017-12-04 17:12:53 -05:00
deathride58
6dded415b8
Merge pull request #4184 from Citadel-Station-13/upstream-merge-33184
...
[MIRROR] Plushie relationships!
2017-12-04 21:32:16 +00:00
Jordan Brown
2393b7759b
People jitter when revived by defibs
2017-12-03 20:19:44 -06:00
deathride58
d9ca1d6831
Merge pull request #4201 from Citadel-Station-13/upstream-merge-33224
...
[MIRROR] Plasma statues get fixed
2017-12-03 23:30:01 +00:00
deathride58
51f07eb65a
Merge pull request #4191 from Citadel-Station-13/upstream-merge-33189
...
[MIRROR] Fixes spelling error in opened cryogenic pods.
2017-12-03 23:21:28 +00:00
kevinz000
66c66f0bd7
[READY]VEHICLE REFACTOR - Riding datums --> Components, Vehicles --> /obj/vehicle, staging for mech overhaul later on
2017-12-03 15:33:29 -06:00
Robustin
a575e2668d
Plasma statues get fixed ( #33224 )
...
* Plasma statues fix
* Actually a fix
* brackets
2017-12-03 13:16:45 -06:00
LetterJay
6217206bae
Merge pull request #4189 from Citadel-Station-13/upstream-merge-33180
...
[MIRROR] cardboard no longer can damage you
2017-12-03 06:16:00 -06:00
LetterJay
c5f0b380cd
Merge pull request #4186 from Citadel-Station-13/upstream-merge-33157
...
[MIRROR] Clean up some loc assignments
2017-12-03 06:14:34 -06:00
LetterJay
dd99e8305a
Update plushes.dm
2017-12-03 06:14:14 -06:00
BeeSting12
8017aac116
Fixes spelling error in opened cryogenic pods. ( #33189 )
2017-12-02 09:45:07 -06:00
Leo
4723a1813b
Merge pull request #33180 from praisenarsie/patch-13
...
cardboard no longer can damage you
2017-12-02 09:44:47 -06:00
vuonojenmustaturska
9f9582ba5e
Clean up some loc assignments ( #33157 )
2017-12-02 09:44:20 -06:00
CosmicScientist
7be54897b2
Plushie relationships!
2017-12-02 09:44:02 -06:00
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
deathride58
6c6149e1af
Merge pull request #4164 from Citadel-Station-13/upstream-merge-33127
...
[MIRROR] Fixes twohanded weapons showing outdated icons when equipped to the back
2017-11-29 03:29:17 +00:00
ShizCalev
47e0943c9c
Fixes twohanded weapons showing outdated icons ( #33127 )
2017-11-28 19:04:09 -06:00
ShizCalev
48c66093fc
Fixes big band music crate ( #33138 )
2017-11-28 19:02:54 -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
deathride58
9538aa645c
Update bombspawner.dm
2017-11-26 21:20:00 -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
be89f4d7dd
Merge pull request #4116 from Citadel-Station-13/upstream-merge-32940
...
[MIRROR] Advanced Laserpointer Feline Interaction
2017-11-26 02:18:56 +00:00
deathride58
b32f24113a
Merge pull request #4131 from Citadel-Station-13/upstream-merge-33075
...
[MIRROR] Adds spawn override system
2017-11-26 02:18:24 +00:00
Jordan Brown
20014e6f44
Merge pull request #33075 from AnturK/itsnotabusewhenitsassistants
...
Adds spawn override system
2017-11-25 16:37:46 -06:00
WJohn
237f0fa8db
Lowers rack layer to 2.8 ( #33069 )
2017-11-25 09:21:02 -06:00
deathride58
14ce7c8118
Merge pull request #4101 from Citadel-Station-13/upstream-merge-32994
...
[MIRROR] Updates some item drops to use drop_location()
2017-11-25 05:53:16 +00:00
Tad Hardesty
d52d546463
Deny buckling when the user is inside lockers, mechs, etc. ( #33015 )
2017-11-24 22:29:40 -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
deathride58
d04bbbdd67
Update step_triggers.dm
2017-11-24 17:59:18 -05:00
deathride58
7b2a926235
Update bump_teleporter.dm
2017-11-24 17:58:29 -05:00
ShizCalev
2762e3b530
Fixes Lord Singuloth hungering for more than he should
2017-11-24 13:00:42 -06:00
ShizCalev
12aa356f10
Updates some item drops to use drop_location()
2017-11-24 12:59:33 -06:00
Tad Hardesty
9806de310d
Remove NODROP from water tank misters ( #32995 )
2017-11-24 12:59:25 -06:00
