a334a455e5
Merge pull request #50628 from willox/exports
...
cargo exports no longer include subtypes when they shouldn't
2020-04-24 22:24:04 +08:00
b30eb7e32e
Take2 ( #50655 )
2020-04-24 09:46:22 -03:00
ec332a96e9
demos config ( #50615 )
...
* demos config
* safety
* functional
* cut lists on init
2020-04-24 16:31:52 +12:00
4eb77bd0b5
Fan Hud ( #50649 )
...
* Should be ready to test
The compiler is throwing a tantrum so I'm committing here to debug.
* Merges hud.dmi with upstream
* adjustments
fixes some typos, adds a blank hud image for fanpinless crew
* It builds
* runtimes
it doesn't actually work yet, just compiles
* Progress
More runtimes removed
* It all works, runtimes sorted
pins made to not go above suit
* Update code/game/data_huds.dm
Adds Rohesie's suggestion
Co-Authored-By: Rohesie <rohesie@gmail.com >
* Makes requested change
Thanks Rohesie!
Co-Authored-By: Rohesie <rohesie@gmail.com >
* Makes requested changes
Thank you Rohesie!
Co-authored-by: Rohesie <rohesie@gmail.com >
2020-04-24 00:10:00 -03:00
91cb265ae2
Delete unused.dm ( #50642 )
...
The PR title and file name are self explanatory
2020-04-23 20:16:23 -03:00
204a4b55f6
Mining skill affects PKA again but only when used on rocks. ( #50535 )
...
* PKA
* haha imagine if that got merged
2020-04-23 19:16:01 -03:00
4230492e77
adds the improvised pickaxe ( #50534 )
2020-04-23 18:47:48 -03:00
d80e059a55
Cult stun nerf ( #50522 )
...
* gonereducedtoatoms
* Icannotspellplesnofunofme
* bloodgone
* staminaloss
2020-04-23 18:02:35 -03:00
2b66dfbc61
Fixes "thats" in a few item descriptions. ( #50520 )
...
* Fixes "thats".
* /obj/item/pickaxe/rusted
Co-authored-by: spookydonut <github@spooksoftware.com >
2020-04-24 01:16:56 +08:00
6b85530a8c
fixes my stupid ( #50595 )
2020-04-24 01:16:33 +08:00
4a5f5dbfe3
only carbons can now use the slap and circle emote + exploit fix ( #50616 )
...
* fixes
* only carbons can now use the slap and circle emote
* this should fix it
* im reatrd
2020-04-24 01:11:15 +08:00
280e7e2c0e
Cardboard cutouts now use a radial menu to choose their skins ( #50617 )
...
* Cutout radials
* Cleanup
2020-04-24 01:10:21 +08:00
e573878ff3
/obj/item/pickaxe/rusted
2020-04-24 01:07:40 +08:00
3bacd3ed9a
emergency cruise ship ( #50482 )
...
man this is luxurious
2020-04-24 01:02:23 +08:00
98c77a828a
Merge pull request #50519 from optimumtact/panikbunker
...
Adds panic bunker config to the world status topic
2020-04-24 00:57:57 +08:00
9bcea78f22
Merge pull request #50512 from Arkatos1/nullrod_radial
...
Nullrods now use a radial menu to choose their skins
2020-04-24 00:57:18 +08:00
f60c57c14a
Merge pull request #50541 from EgorDinamit/fluffwrench
...
Small fix for Forgottenship ruin.
2020-04-24 00:53:22 +08:00
72617ed483
Who roped me into this. ( #50537 )
2020-04-24 00:51:57 +08:00
f8a99c28a7
removes confusing bitflag in research.dm part 2: no webeditalaroo ( #50536 )
...
* epic kevinz moment
* extra checks
* done
* fixes
* forgot this one
* webedit
2020-04-24 00:50:47 +08:00
0ec86b44b1
adds new stamps, resprites old ones, various cool stuff ( #50573 )
...
* adds new stamps, resprites old ones, various cool stuff
* FUCK
* fix
* today i will forget a comma
* ok i guess
2020-04-24 00:43:12 +08:00
2d03a01fe0
Ninja Suit Initialization Refactor + Cleanup ( #50563 )
...
* ninja cleanup
* documentation
* missed these
2020-04-24 00:42:02 +08:00
c681d26252
He sold on the cargo shuttle? Bugfix eet. ( #50599 )
2020-04-24 00:39:21 +08:00
2303d750cf
Merge pull request #50604 from ArcaneMusic/cashlogging
...
Basic economy logging.
2020-04-24 00:38:08 +08:00
66c336c535
Merge pull request #50614 from actioninja/hydrotray-runtime
...
Fixes a runtime on hydroponics trays
2020-04-24 00:37:07 +08:00
a00778f16e
Add EYE_STAB to item_flags ( #50556 )
...
* Add EYE_STAB to item_flags
* add to surgicaldrill and scalpel
2020-04-23 12:28:37 +02:00
c909880118
cargo exports no longer include subtypes when they shouldn't
2020-04-23 05:21:27 +01:00
321294a5cb
Dominate & Abyssal Gaze are now a pointed spells ( #50621 )
...
* Simple turf aim assist
* Abyssal Gaze, Dominate pointed spells, can_target cleanup
* Cleanup
* Icon cleanup and fixes
* Duplicit check
* Update code/modules/spells/spell_types/construct_spells.dm
Co-Authored-By: Rohesie <rohesie@gmail.com >
Co-authored-by: Rohesie <rohesie@gmail.com >
2020-04-22 16:39:17 -03:00
f1d5fd2d79
way overtuned ( #50399 )
2020-04-22 12:15:51 -03:00
564620c14d
changes cult sprites + radials ( #50620 )
...
* makes cult sexy
* turns cult sprites into sex
* gurgr
* hola
* final commit maybe
* FUCK
* shit
* a
* walla walla bing bong
* man fuck
* i didnt even know you could do this wtf
* new sounds from actioninja
* ahoy spongebob
* yeah
* bazinga
* should be finished
* oops
2020-04-22 11:57:00 -03:00
1dc685af42
Merge pull request #50578 from trollbreeder/mapeditoricons
...
Adds icons for gibspawners and mob_spawns to help with mapmaking
2020-04-22 18:57:02 +08:00
17bd8c2099
Merge pull request #50576 from Fikou/patch-1
...
you can now make honeybuns again
2020-04-22 18:50:06 +08:00
e0bd402f03
Merge pull request #50584 from jacklecroy/ramadan
...
Adds foreign calendar datum and fixes Ramadan holidays
2020-04-22 18:48:54 +08:00
445d929c5c
Merge pull request #50596 from Arkatos1/papersack_radial
...
Papersacks now use a radial menu to choose their skins
2020-04-22 18:46:54 +08:00
6ea425bd92
Merge pull request #50581 from nauticalfellow/doubletrouble
...
Quick one-line fix for two war buttons
2020-04-22 18:46:22 +08:00
703274cf02
Fixes a runtime on hydroponics trays
2020-04-22 02:10:12 -07:00
1e417ef119
Removes Metalgen Recipe ( #50552 )
...
* Fixes the economy.
* Update others.dm
2020-04-22 00:55:15 -03:00
9d1ecb188d
Fixes merge conflict
2020-04-21 21:09:56 -04:00
b20683b1e0
Merge remote-tracking branch 'upstream/master' into cashlogging
2020-04-21 21:02:38 -04:00
0e2dfb6cc3
I think this is the thing for public logging?
2020-04-21 20:28:38 -04:00
4e1f479132
Adds bepis cash lost to the aether as well.
2020-04-21 17:41:49 -04:00
ddee742ad9
Basic econ logging
2020-04-21 17:37:15 -04:00
3f4c8f529c
Cleanup
2020-04-21 13:28:53 +02:00
bc50efd601
Autodoc fix
2020-04-21 13:24:15 +02:00
a1fd74b195
Autodoc
2020-04-21 13:23:52 +02:00
3a3059dd92
Fixes and further cleanup
2020-04-21 12:59:16 +02:00
6bb4c0c2f2
Merge branch 'master' of https://github.com/tgstation/tgstation into papersack_radial
2020-04-21 12:07:34 +02:00
dc89ef0239
Turbotany version 1.2 ( #50513 )
...
* EVERYTHING. Check the changelog.
* Minor species change, spade fits on plant belt.
* Local man blind, news at 11.
* Longrange pollenation, and fixes pill composting.
2020-04-21 02:12:49 -07:00
3a3bbfb0c3
Removes soul from icon names
2020-04-21 09:40:52 +02:00
d73103eec9
Merge pull request #50561 from Arkatos1/radial_tweaks
...
Radial menu tweaks
2020-04-21 15:12:00 +08:00
2860850635
Add foreign calendar datum
...
Converted Hebrew calendar to a child of this datum
Foreign calendar is an easy way to support other
calendar systems for the purpose of holidays.
Added Islamic calendar and fixed Ramadan to
be more accurate than it currently is.
2020-04-20 18:22:38 -04:00
spookydonut
ArcaneMusic
Rob Bailey
RaveRadbury
oranges
Qustinnus
Fikou
Archanial
Arkatos1
EOBGames
Bobbahbrown
Iamgoofball
William Wallace
tralezab
ArcaneMusic
Arkatos
trollbreeder
Jack LeCroy