cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-02-09 23:27:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,549 Commits 12 Branches 0 Tags
ed5e33db04c51461fbbb33336afa02e3277798da
Commit Graph

72 Commits

Author SHA1 Message Date
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
Ghom
291dcf9515 Merge pull request #10575 from Arturlang/TGUIs_Nexties 
[TESTMERGE] Properly working TGUI Next
 2021-01-04 19:47:54 -03:00
Chloe Carver-Brown
c2a937bb73 Changing Nanotrasen to Kinaris where needed 2020-12-31 17:58:25 +00:00
QuoteFox
7fb3ed17f7 Merge pull request #755 from ArchieBeepBoop/reagentsagain 
Ports reagents id removal and typepath usage
 2020-12-23 17:48:37 +00:00
Oposshim
ff4d63e8e0 a sort of recipe tweak addon 2020-12-09 13:10:46 -05:00
Lin
a7c539ac32 Ports reagents id removal and typepath usage. 2020-12-09 14:32:36 -03:00
Dahlular
238ab653c4 Merge pull request #707 from Oposshim/another-nanotrasen-muh-lore-tweak 
Kinaris Corp 1.1.9
 2020-11-27 07:40:04 -07:00
Dahlular
ea1a66fd8b Merge pull request #698 from ArchieBeepBoop/hev 
HEV Suit Mk.I
 2020-11-22 01:36:12 -07:00
Poss
e27b3b7976 Update armory.dm 2020-11-21 22:39:07 -05:00
Poss
7c91ead418 Update armory.dm 2020-11-21 22:19:16 -05:00
Poss
4679cb537f Update armory.dm 2020-11-21 22:18:28 -05:00
Oposshim
7d6de4d969 Update armory.dm 2020-11-21 22:14:40 -05:00
Poss
88420d9de6 Delete armory.dm 2020-11-21 21:59:09 -05:00
Oposshim
bb1694f301 Kinaris Corp 1.1.2 
another long overdue haul of shit I forgot/was to busy to get the first patch around.
 2020-11-21 12:05:56 -05:00
kevinz000
c7db7cb2be The ID Code Cleanup and Fixening (tm) 2020-11-20 20:55:27 -03:00
Dip
762dd621ad HEV Suit Mk.I 2020-11-19 18:41:48 -03:00
Dip
6e989dfa51 fixes trash bag of holding bounty 2020-11-05 04:12:08 -03:00
Dip
65476a1b54 hypernob bounty 2020-11-05 03:56:37 -03:00
Ghom
28cdb9c5f1 Oh no. 2020-10-30 05:30:15 -03:00
kevinz000
82daa9b75e Merge pull request #9709 from Trilbyspaceclone/cargo_memes_3 
Adds 8 more sci crates to cargo
 2020-10-28 05:52:11 -03:00