oranges
bf9f81bf7e
Merge pull request #32751 from ninjanomnom/keybindings
...
In-code key handling system, Take 2
2017-12-05 22:15:13 +13:00
oranges
bd954fe780
Merge pull request #32964 from AutomaticFrenzy/patch/joules
...
Measure energy values in joules
2017-12-05 20:42:25 +13:00
ACCount
88187f86d5
Moves some machine sprites into /machines/ folder ( #33124 )
...
* Moves biogenerator.dmi
* Separates cryogenic2.dmi into 3 sprite files
* Updates a map
* moves suit storage sprite
* Gives cameras their own file
2017-12-04 14:45:35 +01:00
Jordan Brown
3fa5acfdf4
People jitter when revived by defibs
2017-12-03 20:19:37 -06:00
kevinz000
5182128d2a
refactors riding datums to a component, vehicle refactor staging for mech overhaul ( #32249 )
2017-12-04 10:33:01 +13:00
Robustin
3876bdc919
Plasma statues get fixed ( #33224 )
...
* Plasma statues fix
* Actually a fix
* brackets
2017-12-03 14:15:42 -05:00
Tad Hardesty
c6da68ab62
Measure energy values in joules
2017-12-02 16:05:31 -08:00
Leo
80aad8cef0
Merge pull request #33165 from MrStonedOne/revert-33062-ore_stacking
...
Revert "Ore Stacking"
2017-12-02 18:00:45 -02:00
Jordan Brown
972fb937cf
Merge pull request #33198 from kevinz000/patch-400
...
Corrects the HoS not having a spare gun fabr- I mean, departmental protolathe board.
2017-12-02 09:45:08 -05:00
CosmicScientist
502905f7ac
Plushie relationships! ( #33184 )
...
* Kor and Bubblegum, sitting in a tree
* complying with oranges' review
* remove the, moves mood setting to make_young, dots Ts, crosses eyes
2017-12-03 00:48:59 +13:00
vuonojenmustaturska
bae75e8459
Clean up some loc assignments ( #33157 )
2017-12-01 22:14:32 -02:00
Leo
4bdcebef99
Merge pull request #33180 from praisenarsie/patch-13
...
cardboard no longer can damage you
2017-12-01 21:56:45 -02:00
BeeSting12
c63bb7a869
Fixes spelling error in opened cryogenic pods. ( #33189 )
2017-12-01 21:54:31 -02:00
Jordan Brown
29c0b4d490
Merge pull request #33151 from AutomaticFrenzy/patch/techwebs-ui
...
Vastly enhance the R&D Console UI
2017-12-01 18:36:59 -05:00
Robustin
5cb01b39d3
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 12:57:54 -05:00
kevinz000
60db53cabe
Gives HoS a lathe board
2017-12-01 03:01:37 -08:00
ninjanomnom
7b7b67edd8
In-code key handling system
2017-11-30 07:40:27 -05:00
Tad Hardesty
0fb7f2649c
Remove unnecessary argument to Join
2017-11-29 14:04:19 -08:00
FrozenGuy5
17d64981bc
cardboard no longer can damage you
2017-11-29 20:18:49 +00:00
AnturK
3ac9d24cb0
Nuke Op Datumization ( #32680 )
...
* Nuke Op datumization.
* Whoops
* Fixes use_tag for nukes. Only syndiebomb uses one.
* Fixing rebase stuff
* How many times
* Cleanup
2017-11-29 13:52:58 -05:00
Kyle Spier-Swenson
8c4885cf6e
Revert "Ore Stacking ( #33062 )"
...
This reverts commit 8e1ac5720d .
2017-11-28 22:56:54 -08:00
kevinz000
8e1ac5720d
Ore Stacking ( #33062 )
2017-11-28 21:27:34 -05:00
Tad Hardesty
23c0516c87
Fix and tidy the output of research scanner goggles
2017-11-28 17:59:42 -08:00
ShizCalev
49c92ada07
Fixes twohanded weapons showing outdated icons ( #33127 )
2017-11-28 20:03:28 -05:00
ShizCalev
24ca193e7e
Fixes big band music crate ( #33138 )
2017-11-28 20:01:29 -05:00
ACCount
81fb344c75
Removes mass-spectrometers ( #32965 )
2017-11-28 10:19:08 -02:00
ACCount
f086eab113
Removes "machine prototypes" ( #33134 )
2017-11-28 03:41:09 -05:00
Leo
96b8d80063
Merge pull request #33099 from jughu/Powercreep-till-the-end
...
Allows toolbelts to carry geiger counters
2017-11-27 12:19:28 -02:00
uraniummeltdown
16de0ac52a
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 13:16:34 +01:00
ShizCalev
395c0ee6a0
Cleans up some qdel(src)'s in Initialize()
2017-11-26 20:15:12 -06:00
ACCount
0d2955e554
More integrated circuit fixes and code improvements ( #33034 )
...
* More integrated circuit fixes and code improvements
* Rewrites thrower component code, adds a helper for future conversion to component datums
* Fixes a mislabeled input
* minor tweaks
* Renames components list
* Changes adj check in thrower
* Fixes tools metal cost
2017-11-26 11:56:47 +01:00
jughu
ad428a5679
Adds geigee counter
2017-11-26 11:44:23 +01:00
Jordan Brown
954c9dc3ba
Merge pull request #33075 from AnturK/itsnotabusewhenitsassistants
...
Adds spawn override system
2017-11-25 17:37:28 -05:00
WJohn
891dc9f3af
Lowers rack layer to 2.8 ( #33069 )
2017-11-25 09:19:59 -06:00
Tad Hardesty
220126fd93
Deny buckling when the user is inside lockers, mechs, etc. ( #33015 )
2017-11-24 23:29:43 -05:00
Dorsisdwarf
ae9ba7bde5
Advanced Laserpointer Feline Interaction ( #32940 )
...
* nerfs laserpointers, adds cat interaction
* typo'd
* fixes is_helpers
* look at you, coder. panting and typoing as you code through my halls
* addresses minor notes, adds iscatperson to purrbation
* Replaces ON_PURRBATION define, changes to logging in laserpointer.dm
* true
* I forgot that its TRUE not true rest the fuck in peace
* Final tweaks
* Removes Stray else
2017-11-24 18:56:11 -05:00
AnturK
b3aa8ac17b
Fixes bullshit (not really)
2017-11-24 22:29:50 +01:00
AnturK
271cbaee71
Adds spawn override system
2017-11-24 22:18:50 +01:00
oranges
73b25d7ef2
Refactor on_reagent_change to pass through the change type ( #32805 )
...
this is purely so the smoke circuit can reset the notification only when
reagents are actually added to it
2017-11-24 12:45:44 +01:00
Tad Hardesty
54630b7c48
Remove NODROP from water tank misters ( #32995 )
2017-11-24 06:05:30 -05:00
ShizCalev
ed12ad417d
Updates some item drops to use drop_location() ( #32994 )
...
* Updates some item drops to use drop_location()
* Little more cleanup
2017-11-24 06:04:50 -05:00
ShizCalev
f912b6eae0
Fixes Lord Singuloth hungering for more than he should ( #33025 )
2017-11-24 05:45:47 -05:00
Emmett Gaines
7c69cdcb8a
Revert math ( #33059 )
...
* Revert "all this wrapping and it's not even christmas (#33035 )"
This reverts commit faaf151580 .
* Revert "fuck me for forgetting to graph this one"
This reverts commit 45d7acea2f .
* Revert "defines math"
This reverts commit 2817a1737b .
2017-11-23 20:59:52 -05:00
ACCount
4c909b5ade
Replaces "console screen" stock part with glass sheets ( #33018 )
...
* Removes console screen
* Map updates
* Removes console screen part sprite
2017-11-23 18:53:18 -06:00
Emmett Gaines
faaf151580
all this wrapping and it's not even christmas ( #33035 )
2017-11-23 10:43:59 +01:00
ninjanomnom
2817a1737b
defines math
2017-11-22 17:36:58 -05:00
oranges
92632ecd76
Merge pull request #32914 from kevinz000/NTNet
...
[READY]NTnet refactor, assimilates exonet
2017-11-23 10:52:44 +13:00
oranges
ccd4981fe5
Merge pull request #32624 from kevinz000/component_uplinks
...
[READY]Refactors uplinks to a component!
2017-11-23 10:16:16 +13:00
ShizCalev
b0f24a892b
Fixes bartender suit having an adjust state ( #32968 )
2017-11-22 13:40:11 -05:00
kevinz000
00966e2aaa
NTnet refactor, assimilates exonet
2017-11-21 20:50:45 -08:00