bcd4ddabec
Automatic changelog generation for PR #13530 [ci skip]
2020-10-11 00:43:52 -05:00
8be9e0aaad
Merge pull request #13530 from Citadel-Station-13/silicons-patch-12
...
THROWING A CLOWN INTO THE SUPERMATTER ENGINE NOW RANDOMLY ADJUSTS ENERGY AND DAMAGE
2020-10-11 18:43:49 +13:00
8a8b30a17a
Automatic changelog generation for PR #13193 [ci skip]
2020-10-11 00:42:52 -05:00
d69e081b23
Merge pull request #13193 from Citadel-Station-13/silicons-patch-17
...
buffsi ntegrated circuit medium screens
2020-10-11 18:42:49 +13:00
92b88925de
Merge pull request #13542 from Citadel-Station-13/silicons-patch-15
...
removes gibbing (blobattack) sound from *blorble so it always plays the far nicer attackblob sound instead
2020-10-11 18:42:06 +13:00
bf7d68884b
Merge pull request #13510 from silicons/google
...
a more sane json-based map override system for jobs (todo port to rp so rp can have map rotation)
2020-10-11 18:39:10 +13:00
9e909095a8
Merge pull request #13015 from silicons/combat_rework_experimental
...
Combat v4: Redesigning Stamina, Sprint, Combat mode
2020-10-11 18:38:53 +13:00
7f611a98e1
Merge remote-tracking branch 'citadel/master' into combat_rework_experimental
2020-10-10 22:23:22 -07:00
671fbe19d0
Automatic changelog generation for PR #13544 [ci skip]
2020-10-11 00:16:52 -05:00
283ce51bc2
Merge pull request #13544 from DeltaFire15/portal-wackyness-fix
...
Fixes a bunch of portal-related runtimes
2020-10-10 22:16:49 -07:00
376f59c8cd
Automatic changelog generation for PR #13540 [ci skip]
2020-10-11 00:04:52 -05:00
d2ce6ca709
Merge pull request #13540 from TheObserver-sys/QoLPass
...
Service+Plumbing QoL Pass 1: Beakers, Belts, Plungers and Pipes
2020-10-10 22:04:49 -07:00
0457042872
Automatic changelog generation for PR #13535 [ci skip]
2020-10-11 00:04:20 -05:00
c3983ee55b
Merge pull request #13535 from Hatterhat/energy-sabres
...
[READY] Energy Sabers - an elegant esword skin for a more civilized age
2020-10-10 22:04:17 -07:00
8f5242ade1
Automatic changelog generation for PR #13533 [ci skip]
2020-10-11 00:02:49 -05:00
792080ca3f
Merge pull request #13533 from shellspeed1/jambalya-
...
Face hugger jambalaya. Should be ready.
2020-10-10 22:02:46 -07:00
120536d448
Automatic changelog generation for PR #13527 [ci skip]
2020-10-11 00:01:22 -05:00
b2336f1140
Merge pull request #13527 from ArchieBeepBoop/rtg
...
Fully Upgraded Advanced RTG Machine Preset
2020-10-10 22:01:20 -07:00
3cf4874707
Automatic changelog generation for PR #13525 [ci skip]
2020-10-11 00:01:13 -05:00
1bd715ffc6
Merge pull request #13525 from Detective-Google/hilberts-juke
...
fixes the hilbert's jukebox(?)
2020-10-10 22:01:09 -07:00
ef52d1272d
Automatic changelog generation for PR #13497 [ci skip]
2020-10-11 00:00:52 -05:00
737b6460af
Merge pull request #13497 from Zandario/species-refactor
...
Refactors some defines for easier Species Development
2020-10-10 22:00:49 -07:00
e584c30cc3
Automatic changelog generation for PR #13233 [ci skip]
2020-10-10 23:59:08 -05:00
8b48cab574
Merge pull request #13233 from Hatterhat/za-hando
...
[READY] za hando - a pr about ling claws and punching shit
2020-10-10 21:59:05 -07:00
63a8b8ed43
Automatic changelog generation for PR #13014 [ci skip]
2020-10-10 23:58:19 -05:00
2919dfee2e
Merge pull request #13014 from Hatterhat/tendril-minimum
...
[REVIEW PLEASE] Minimum Megas/Tendrils For Lavaland But Cleaner I Swear
2020-10-10 21:58:15 -07:00
5d97b04a6f
Automatic changelog generation for PR #13531 [ci skip]
2020-10-10 17:34:02 -05:00
4f5f56e68f
Merge pull request #13531 from DeltaFire15/quick-fix
...
Oops! Regenerate_bodyparts-edition
2020-10-10 15:33:59 -07:00
9990337f32
fixes a bunch of portal runtimes
...
Ah yes lets just change the basic portal generation proc but not change the actual calls to it for the most part, what could go wrong?!
2020-10-10 23:40:12 +02:00
b9aea84330
Automatic changelog generation for PR #13472 [ci skip]
2020-10-10 13:14:28 -05:00
ad32b8f437
Merge pull request #13472 from timothyteakettle/slime-puddle
...
the pr that lets slimes turn into useless puddles
2020-10-10 11:14:25 -07:00
2f2cf75326
Automatic changelog generation for PR #13405 [ci skip]
2020-10-10 13:02:33 -05:00
d8b39bcc5f
Merge pull request #13405 from silicons/tracer
...
warp implant is now infinite use and now actually reverts your position to 10 seconds before in time rather than use a snowflake chemical to teleport you 5 seconds later
2020-10-10 11:02:30 -07:00
a1ccc31877
fuck you travis
2020-10-10 18:05:31 +01:00
e40e4a79d3
Allows plantbags to hold plantdisks
2020-10-10 08:58:54 -04:00
19f1e99a8c
mass ports like 15 tg prs + counting ( #13386 )
...
* changes
* ok
* changes
* sigh
* fixes
* changes
* fix
* fix
* alright
* fixes
git pus
* fix
* fix
* fix
* test
* ok
* Update code/modules/paperwork/ticketmachine.dm
Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com >
* ok
* compile and other stuff
* ok
* fix
* fix
* Fix
* Update menu.dm
* Update view.dm
* Update preferences.dm
Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com >
Co-authored-by: Putnam3145 <putnam3145@gmail.com >
2020-10-10 12:20:33 +02:00
69ef1ed0e0
Automatic changelog generation for PR #13444 [ci skip]
2020-10-10 05:15:42 -05:00
385bd57940
reworks family heirlooms, adds heirlooms that can be based off your species ( #13444 )
...
* corgi tracker
* better heirloom system
* typo
2020-10-10 12:15:39 +02:00
04db791004
Update human.dm ( #13491 )
2020-10-10 11:57:35 +02:00
7200f2b004
Update emote.dm
2020-10-10 02:47:28 -07:00
10009a39d7
Review Change Request 1
2020-10-09 09:17:28 -04:00
98f398338a
belt fix and icons
2020-10-09 02:34:42 -04:00
c9857996f4
sprites
2020-10-09 01:38:46 -04:00
0d1d94fd06
belt
2020-10-09 01:17:46 -04:00
0d8bea1c9b
QoL: Adds BSB's to Service, adds R.Plunger design
2020-10-08 23:27:17 -04:00
96c6608d59
enabled plumbing on trays.
2020-10-08 22:50:24 -04:00
3f33968ee7
Merge remote-tracking branch 'Upstream/master'
2020-10-08 21:43:19 -04:00
8d0f5c8380
saber inhands WOO
2020-10-08 19:38:10 -05:00
8e4c64a24b
Remove clothing shito as requested
2020-10-08 18:48:26 -05:00
15f7ce6731
Automatic changelog generation for PR #13539 [ci skip]
2020-10-08 12:05:34 -05:00
CitadelStationBot