Commit Graph

29060 Commits

Author SHA1 Message Date
Timothy Teakettle 2daed9250f some bugfixes 2021-05-02 18:30:35 +01:00
Bapldap aefa9eb292 lesspopcrates
less population required for surplus crates, everyone loves them. I don't see how this could affect gameplay in any negative way :)
2021-05-01 22:31:24 -05:00
silicons 1f06ac1b42 ohno 2021-05-01 18:18:21 -07:00
Timothy Teakettle 7efadade15 href fix 2021-05-01 20:55:13 +01:00
Timothy Teakettle 8aed1b4236 more color code 2021-05-01 20:37:22 +01:00
Timothy Teakettle ddc3e3b3b2 Update preferences.dm 2021-05-15 21:24:20 +01:00
The0bserver f1109c4f67 what a crate day (initial commit) 2021-05-01 02:15:07 -04:00
Timothy Teakettle ac504d679b digi humans 2021-04-30 14:07:44 +01:00
Lin c80c974b6c Merge pull request #14668 from qweq12yt/fix-riot-suit
[Fix] Restores the Sprite for the Riot Suit
2021-04-29 22:24:00 -05:00
WanderingFox95 25fc57cbef Merge branch 'master' into WanderingFox95-LavalandWine 2021-04-29 10:54:18 +02:00
WanderingFox95 3ea98d3096 Merge branch 'master' into WanderingFox95-TheUnrollingPin 2021-04-29 10:54:00 +02:00
silicons 4289b8be1e Merge remote-tracking branch 'citadel/master' into backend_sync 2021-04-28 22:34:17 -07:00
silicons 7cc6bba5ff fixes 2021-04-28 22:27:09 -07:00
silicons 456b55cb06 that too 2021-04-28 22:25:39 -07:00
silicons 80a8467e9e hm 2021-04-28 22:24:49 -07:00
silicons e3755fba92 Merge pull request #14639 from necromanceranne/cyberorgan_stuff_ye
Ports a significant amount of the tg cybernetic organ code + more
2021-04-28 21:20:57 -06:00
silicons 986aef27b2 Merge pull request #14648 from SandPoot/decal-painter-tgui
Decal Painter menu is no longer shit and has visible previews.
2021-04-28 21:20:24 -06:00
silicons 4f73557168 Merge pull request #14647 from SandPoot/limb-grower-tgui
Ports TGUI limb grower from tg
2021-04-28 21:20:01 -06:00
silicons cb0574a560 Merge pull request #14649 from TheObserver-sys/BulletPass
TRADE OFFER: YOU GIVE ME 30000 PLASMA. I GIVE YOU A SINGLE MAGAZINE OF 10MM INCINDIARY AMMO
2021-04-28 21:17:55 -06:00
silicons d4529b1bf3 Merge pull request #14651 from WanderingFox95/WanderingFox95-ReagentDartgunRebalance
The reagent dart gun uplink item needed work.
2021-04-28 21:17:36 -06:00
silicons 17d7c4dd9a Merge pull request #14659 from DrPainis/patch-12
Bubblegum HALLUCINATIONS are capitalized
2021-04-28 21:17:15 -06:00
silicons 9bef72f205 Merge pull request #14635 from necromanceranne/blindfold_but_not
Adds fake blindfolds. For reasons.
2021-04-28 21:17:06 -06:00
silicons 86bdb2455d Merge pull request #14636 from TheObserver-sys/CrateDeal
Inconsistency Fixes, 10MM Rifle tweaks.
2021-04-28 21:16:58 -06:00
silicons b108a6fe7e Merge pull request #14643 from necromanceranne/space_adapt_resprite
Changes the space adaptation sprite to something more subtle.
2021-04-28 21:16:51 -06:00
silicons fefb33454f do that too 2021-04-28 16:16:55 -07:00
Timothy Teakettle cb98cbd19f colour backend 2021-04-28 22:33:05 +01:00
Putnam3145 8f14424a63 Fixes a couple runtimes in activity tracking (#14666) 2021-04-28 22:56:15 +02:00
qweq12yt 3afb801036 huh 2021-04-28 15:41:20 -03:00
Timothy Teakettle 72a009dc7c based? 2021-04-28 19:31:20 +01:00
timothyteakettle 2f5cb63994 who deleted this 2021-04-28 17:37:09 +01:00
timothyteakettle 79b73a53a0 working buttons probably 2021-04-28 16:53:12 +01:00
keronshb 6d86809616 Removes the Reinforcement Chromosome from Genetics. (#14641)
* Removes Mutadone Proof from Genetics

This might be a bit too good.

* Fixes so mutadone actually works

Oops

* Removes the reinforcement chromosome

Removes the reinforcement chromosome
2021-04-28 14:09:37 +02:00
silicons 47489c21d6 Merge remote-tracking branch 'citadel/master' into auxtools-atmos 2021-04-27 00:59:45 -07:00
silicons d547aa7ff1 almost compiling 2021-04-26 23:37:26 -07:00
silicons 1585d1c2be fixes 2021-04-26 23:32:33 -07:00
silicons a415453540 ripping off my own code 2021-04-26 23:29:37 -07:00
silicons eb2c12ceee yell wip 2021-04-26 23:10:10 -07:00
silicons 8fe45263c5 whew 2021-04-26 22:58:30 -07:00
silicons 02b40589fe conflict gone 2021-04-26 22:46:16 -07:00
silicons 7ccb5bc711 fixes 2021-04-26 14:21:59 -07:00
silicons 275b532a8c Merge remote-tracking branch 'citadel/master' into combat_v7 2021-04-26 14:17:43 -07:00
Timothy Teakettle 06e003f49b functionality 2021-04-26 21:58:12 +01:00
silicons 03fa382f36 Update autobunker.dm 2021-04-26 13:57:34 -07:00
Timothy Teakettle ca3ef3b0f3 X button 2021-04-26 18:02:47 +01:00
WanderingFox95 b252773e76 Annoying 2021-04-26 19:00:41 +02:00
WanderingFox95 b27c043760 Fixed a little error 2021-04-26 18:54:12 +02:00
WanderingFox95 8d8f1173ab Adds the unflattening functionality 2021-04-26 18:44:02 +02:00
WanderingFox95 6c9ead8f1c Adds the Recipe to Wood Crafting 2021-04-26 18:42:33 +02:00
WanderingFox95 7d6da9a9fd Adds it to the vendor
so you can buy it
2021-04-26 18:41:34 +02:00
WanderingFox95 b7c8871b69 Adds the Item: Unrolling Pin
Like a Rolling Pin but somehow the wrong way around.
2021-04-26 18:40:12 +02:00