Commit Graph

650 Commits

Author SHA1 Message Date
QuoteFox e9af7704d9 Merge pull request #1005 from Kabramen/more-augments
bimbo augmentation
2021-02-28 04:41:09 +00:00
QuoteFox 74fd8d8f13 Stat panel fixes (Not done) 2021-02-28 03:58:07 +00:00
Kabra_men 17b731a2a5 bimbo augs 2021-02-27 23:31:32 -03:00
QuoteFox 6ca9ac4123 Revert "Revert "Tg status tab""
This reverts commit b4fa877cc7.
2021-02-27 04:30:52 +00:00
QuoteFox b4fa877cc7 Revert "Tg status tab"
This reverts commit 931f3ca63b.
2021-02-27 04:02:22 +00:00
QuoteFox 931f3ca63b Tg status tab
finally.
2021-02-27 01:47:19 +00:00
QuoteFox d4abf52004 clustaur nerf. 2021-02-26 21:26:34 +00:00
QuoteFox 65eca8b997 Merge pull request #1001 from Kabramen/aug-parts
more augmentation opitions!
2021-02-26 06:36:20 +00:00
Kabra_men 7ab149b04e augments 2021-02-26 01:44:18 -03:00
QuoteFox 233a357a5d matches now make a noise 2021-02-26 01:52:55 +00:00
DragonTrance 6aa9462551 better 2021-02-25 14:31:00 -07:00
DragonTrance 4de3075120 squashes defib runtime 2021-02-25 14:14:39 -07:00
QuoteFox 9dd61f3efb Pens now write on people, Harm intent to stab them like the old way.
Washable at showers.
2021-02-22 23:08:42 +00:00
QuoteFox 973e45e102 Merge pull request #983 from DragonTrance/plant-adding
Botany Changes
2021-02-21 23:08:24 +00:00
DragonTrance 3ebb7488de Merge branch 'master' into plant-adding 2021-02-21 12:06:48 -07:00
DragonTrance 24cb27b67c #5 2021-02-21 08:37:10 -07:00
Kharkov72 4e2d9a3bd0 I cannot let this go unadded 2021-02-21 00:53:05 -05:00
Chloe Carver-Brown 63063ecd9b It liiiiiives 2021-02-20 14:48:12 +00:00
Chloe Carver-Brown a38a978f70 Revert "Poggers"
This reverts commit 389291b46a.
2021-02-19 23:35:57 +00:00
Chloe Carver-Brown 6d8d602907 Adding clustaur grenades 2021-02-19 23:21:12 +00:00
Chloe Carver-Brown 389291b46a Poggers 2021-02-19 22:19:12 +00:00
Chloe Carver-Brown c1c9b3bba2 Poggers 2021-02-15 23:47:04 +00:00
Vladin 1bfe8bb816 love in the air
no not really thats actually nerve gas
2021-02-13 21:51:56 -05:00
DragonTrance 58b69503e3 #4 2021-02-11 20:02:40 -07:00
DragonTrance 75415bb7af you know what, dont even deconstruct them 2021-02-10 07:33:11 -07:00
DragonTrance d09400af15 stop exploiting constructable showers 2021-02-10 07:23:31 -07:00
DragonTrance ed135323dc #2 2021-02-10 07:18:26 -07:00
QuoteFox 22d0f71b6c Fixes empty tape recorders getting stuck on pocket and belt slots 2021-02-09 10:31:38 +00:00
DragonTrance 187471f0af #1 2021-02-08 19:15:44 -07:00
Dahlular c2435b144d Merge pull request #945 from VladinXXV/atmosia
Atmos drip
2021-02-06 20:44:50 -07:00
QuoteFox b39881f441 vending fix, wallet fix
vending fix, wallet fix
2021-02-04 23:40:40 +00:00
QuoteFox a40e002595 loose ends.
more prices I missed
2021-02-04 14:20:17 +00:00
QuoteFox c0de8ec3ac some prices and lights I forgot. 2021-02-04 13:10:16 +00:00
QuoteFox 5584bb9522 Economy part 2 - Vendors 2021-02-04 12:42:50 +00:00
Vladin ac11142edc walk on fire
not really tho
2021-02-02 20:30:16 -05:00
QuoteFox 409a221c42 Merge pull request #940 from VladinXXV/typo-hell
Quality of Life +1
2021-01-29 21:21:54 +00:00
Vladin 17b20e3a3e Sthefo.... stepo..... steto.... ssetho.....
THE THING YOU LISTEN TO THE HEART WITH DAMNIT
2021-01-29 16:06:02 -05:00
QuoteFox 4980b0556d Merge pull request #936 from ArchieBeepBoop/solar
Modular Solar Panels + Solar Tracker Fix + Compile issue fix
2021-01-29 20:38:48 +00:00
QuoteFox 3d1aabd694 Merge pull request #937 from quotefox/economy
Hyper Economy part 1 - Money Movement.
2021-01-29 01:18:58 +00:00
QuoteFox 39a5e2863e final touches to part 1
final touches to part 1
2021-01-29 01:08:23 +00:00
QuoteFox 9366e720fa Merge pull request #935 from Kabramen/chairs
One step closer to become IKEA: More furniture to the new woodtypes, 3 new chair bounties + one stuff for loadout
2021-01-28 23:59:27 +00:00
Archie d50b781203 SolarTest11 2021-01-28 20:22:08 -03:00
Kabra_men 0b1a40baee that's a lot of stuff heck 2021-01-28 18:28:48 -03:00
Vladin 479c003c97 Do not fuck the bird.
Kenk plush can no longer be sex'd, as per his request.
2021-01-26 23:43:51 -05:00
QuoteFox 0057c577ed Revert "Merge pull request #924 from MalricB/sus"
This reverts commit 85f3bb35c9, reversing
changes made to 667aa686c1.
2021-01-26 17:58:36 +00:00
QuoteFox 586ed7c46c Revert "Merge pull request #926 from MalricB/sus"
This reverts commit cbc7993239, reversing
changes made to c453ed509f.
2021-01-26 17:52:14 +00:00
QuoteFox cbc7993239 Merge pull request #926 from MalricB/sus
(E)Rp is now legal
2021-01-26 14:30:45 +00:00
CygnusB 086debf760 Update emergency_button.dm 2021-01-26 11:26:49 -03:00
QuoteFox 85f3bb35c9 Merge pull request #924 from MalricB/sus
!! Emergency Staff Meeting !!
2021-01-26 11:56:12 +00:00
CygnusB 5c55fd0c08 quotefox kinda sus ngl 2021-01-25 23:55:20 -03:00