Commit Graph

91 Commits

Author SHA1 Message Date
MrSky12 ad066ac5b7 Gatofication 10/10/2022 2022-10-10 12:29:23 +02:00
MrSky12 91d52d57e6 Removed Winfre (HS13 reference) 2022-09-05 17:11:33 +02:00
MrSky12 92df10c505 Revert "Garret changes."
This reverts commit 05881a1561.
2022-08-01 00:46:44 +02:00
MrSky12 05881a1561 Garret changes.
All of it is just a text edit.
2022-08-01 00:25:13 +02:00
MrSky12 da87e88321 Gatofication 2 2022-06-03 00:07:56 +02:00
Yipper Yapper ab8b9f08c9 Import part two.
added alt click to rotate and added to cargo packs.
2021-07-28 20:27:34 -07:00
Dahlular b01231fe6d Boosts the price of the HEV suit crate 2021-07-15 18:52:19 -06:00
Dahlular 358b3cf0c0 Merge pull request #1315 from ArchieBeepBoop/rbmkfixes
Fixes some issues with the cargo RBMK / Gas nuclear reactors
2021-06-22 22:37:48 -06:00
Archie 7584df22b8 RBMK Fixes 2021-06-22 03:03:27 -03:00
Archie 6de7ffa2f5 Fixes a possible issue with areas in layenia & logs loan 2021-06-18 00:46:31 -03:00
QuoteFox 3b85fab3dd Merge pull request #1229 from ArchieBeepBoop/iconupdates
Ports: Icon state updates Part 1
2021-06-06 19:51:08 +01:00
Lin a5cf94ab29 Merge pull request #10212 from Ghommie/Ghommie-cit471
Ports some hud and update_icon code updates.
2021-06-04 15:23:40 -03:00
Kabra_men 6ea19bb7d2 Engislut 2021-06-02 18:20:06 -03:00
Archie 5e57fa38f6 Merge remote-tracking branch 'upstream/master' into RBMK_Branch_Simple 2021-05-05 14:49:01 -03:00
Archie 0867777fa0 Fuel rod rework + templates 2021-05-05 04:41:07 -03:00
Archie 5620f0a9ae whoops. 2021-05-05 01:25:23 -03:00
Archie e6b5742291 Improvements all around! 2021-05-05 01:23:37 -03:00
Kabra_men ebce3afd96 Bounty 2021-05-04 13:05:37 -03:00
Kabra_men 21a7c1098d Condom economy expasion 2021-05-04 12:01:54 -03:00
Archie f3e05543f5 Funny TEG Update 2021-02-25 03:41:11 -03:00
DragonTrance 9b8fc88089 datum + typo 2021-02-22 12:43:58 -07:00
DragonTrance f70a3f8277 botany fixes
Fixes crate datum, hydroponic chemical reactions requiring a seed, indentation, and spades not resetting life timers
2021-02-22 12:21:39 -07:00
DragonTrance 3ebb7488de Merge branch 'master' into plant-adding 2021-02-21 12:06:48 -07:00
DragonTrance 84d8e1a44f Update organic.dm 2021-02-21 11:01:51 -07:00
DragonTrance c729c61765 added tons of botany changes from citadel (not instability) 2021-02-21 09:57:29 -07:00
DragonTrance 24cb27b67c #5 2021-02-21 08:37:10 -07:00
Vladin 1bfe8bb816 love in the air
no not really thats actually nerve gas
2021-02-13 21:51:56 -05:00
Vladin Ampora b2917ae057 Update costumes_toys.dm 2021-02-01 06:47:59 -05:00
Vladin e9aa0f67c8 I am a wizard, not a baboon brandishing a stick.
Any wizard bright enough to survive for five minutes was also bright enough to realize that if there was any power in demonology, then it lay with the demons. Using it for your own purposes would be like trying to beat mice to death with a rattlesnake.
2021-01-31 21:31:57 -05:00
Vladin 17b20e3a3e Sthefo.... stepo..... steto.... ssetho.....
THE THING YOU LISTEN TO THE HEART WITH DAMNIT
2021-01-29 16:06:02 -05:00
Kabra_men 0b1a40baee that's a lot of stuff heck 2021-01-28 18:28:48 -03:00
Kabra_men 41c87b5e85 more wood stuff 2021-01-25 17:37:06 -03:00
Kabra_men d71a599224 cargo stuff 2021-01-22 21:42:38 -03:00
CygnusB 8ece699ed9 Merge branch 'master' into punishesarchie 2021-01-19 06:30:10 -03:00
CygnusB 958b01f4d0 part 2
forgot a bunch of shit, also had to re-do parts because we don't have update_overlays()
2021-01-19 06:09:55 -03:00
Dahlular 9f0b22fa95 Code Cleanup + Cushions 2021-01-18 01:14:58 -07:00
Dahlular b8996b962d Merge pull request #898 from Dahlular/ikeacargo
REEEEEEEEEEEEEEEEEE
2021-01-17 04:24:26 -07:00
Dahlular 4c02fcc06f REEEEEEEEEEEEEEEEEE 2021-01-17 04:22:20 -07:00
Dahlular 0fa8bff364 Merge pull request #897 from Dahlular/ikeacargo
Carpentry Part 1
2021-01-17 04:17:39 -07:00
Dahlular 30cfdc1f22 makes it fucking buyable 2021-01-17 04:12:13 -07:00
Archie 12fde70d0c Cargo Changes Initial 2021-01-16 17:40:43 -03:00
Dahlular 46ffd229c9 whoops 2021-01-15 23:17:04 -07:00
Dahlular bb892c90e4 New Cargo Crates, Moves Some Around
Diminicillin + Prospacillin cargo crates, and moves some other crates around. Removes an offensive comment.
2021-01-15 22:38:24 -07:00
Chemlight 403f4336db Lotsa bus implants and ATV supply n' demand
Since Krav maga has an implant to toggle it on and on, I thought lets add everything else! (Aside from boxing, that for example is just tied to boxing gloves).

Also ATV's are too easy to get, make it need effort to buy and become speed racer.
2021-01-15 04:25:16 -08:00
Archie 3d46b689ac Fix EOL issues 2021-01-14 14:54:39 -03:00
kevinz000 b5fe141a49 Supply Pod Code Update 2021-01-14 14:31:35 -03:00
Archie 78da9a5a12 Merge branch, update to current 2021-01-08 07:26:35 -03:00
kevinz000 5d80346f8f Merge pull request #9993 from Ghommie/Ghommie-cit412
Ports tgstation loom changes, and durathred golems.
2021-01-05 16:54:23 -03:00
Archie 9e37d3be62 Fix merge conflicts 2021-01-05 03:41:08 -03:00
Lin b0779fe2d7 Merge pull request #9983 from Ghommie/Ghommie-cit408
refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open.
2021-01-05 01:34:16 -03:00