shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
46,907 Commits 5 Branches 0 Tags
8564d7ce56cef2375e77f8128678db77abbe674f
Commit Graph

791 Commits

Author SHA1 Message Date
Putnam3145
b2d816b825 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into station_traits 2022-08-07 17:59:28 -07:00
Hatterhat
2155a8bdce funny ammo 2022-08-03 06:11:04 -05:00
deathride58
578eb440c1 If you know, you know; fixes a decade-old typo, essentially mirroring RP's typo fix 2022-07-20 16:51:38 -04:00
Putnam3145
4af3633d6f Some gas balancing/rearranging 2022-05-24 18:11:58 -07:00
Putnam3145
33889870c9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into station_traits 2022-05-17 13:22:40 -07:00
silicons
da09439093 Merge pull request #15585 from SandPoot/Initialize(mapload) 
Every case of initialize that should have mapload, does
 2022-04-15 17:41:57 -07:00
BlueWildrose
f235839351 Adds carcinisoprojection jelly, a limb regrowth chem that is made from slime mutation toxin & blood (#15053) 
* Limb regrowth chem, new disease of crab cancer

* Limb regrowth adjustments

* oops, sorry linters.

* oh right this would probably fuck with dullahans

* woops missed a newline

* Update code/modules/reagents/chemistry/reagents/medicine_reagents.dm

Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>

* just realized this check is unnecessary.

* let's add a mood debuff while we're at it

* Update medicine_reagents.dm

* add a bounty

* misspelling

* Update crabcancer.dm

Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
 2022-04-15 00:37:08 +02:00
SandPoot
695835fcd6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Initialize(mapload) 2022-04-09 00:03:13 -03:00
SandPoot
586a035132 Update files 2022-04-06 18:41:31 -03:00
Putnam3145
6199aa4d60 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into station_traits 2022-03-30 12:35:12 -07:00
SandPoot
189716314f Would you like some defines in these trying times? 2022-03-23 12:10:02 -03:00
SandPoot
a8f454bd72 Upload files 2022-03-16 14:00:31 -03:00
keronshb
f1ca283318 Merge branch 'master' into familyport 2022-02-11 14:04:57 -05:00
Putnam3145
629ce5bea6 Station traits 2021-12-08 16:17:35 -08:00
LetterN
8dcfea5817 Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch 2021-11-21 10:34:14 +08:00
DeltaFire
6224da71a3 contents_explosion 
at least this one had less overrides.
 2021-11-14 21:41:42 +01:00
DeltaFire
6aa906395c not a gaius reference 
hhhh let me just replace all the ex_acts missing some args and adjust them
 2021-11-14 21:34:59 +01:00
keronshb
9153115566 Merge remote-tracking branch 'upstream/master' into familyport 2021-11-05 10:50:08 -04:00
LetterN
a057139c33 Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch 2021-10-30 11:54:20 +08:00
LetterN
99019166e4 i think it works 
MAJOR antag backend update
- you cannot bruteforce the pen anymore
- uplink now uses bitflag to lock purchases
- poplock is handled entirely by the buyable uplink items
- tgui antag intro (for selected ones)
 2021-10-30 11:45:50 +08:00
keronshb
8978ee10fe Merge remote-tracking branch 'upstream/master' into familyport 2021-10-28 14:41:46 -04:00
Letter N
bcdf96f274 Revert "TGUI alerts, lists, inputs" 2021-10-28 12:17:29 +08:00
SandPoot
13d7a166fe Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tgui-alerts-and-what-not 2021-10-27 13:54:49 -03:00
silicons
d6d037de43 Merge pull request #15232 from Putnam3145/minesweeper-removal 
Removes minesweeper
 2021-10-27 05:11:48 -07:00
SandPoot
17986fea3f cannot escape 2021-10-16 14:24:22 -03:00
SandPoot
1561138350 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tgui-alerts-and-what-not 2021-10-16 14:11:00 -03:00
keronshb
1cd2c59776 Merge branch 'master' into familyport 2021-10-15 14:43:53 -04:00
silicons
91e7cb293c Merge pull request #15223 from Hatterhat/yeehaw-box 
The Yeehaw Update - makes .38 lever-actions slightly more accessible
 2021-10-11 20:45:42 -07:00
keronshb
0bae06adcd Original Port 2021-10-11 22:00:54 -04:00
SandPoot
5aa12b4716 There's a bounty for this right? i spent nearly two full days at this 2021-10-05 18:10:32 -03:00
SandPoot
bbe32fa38a Upload files 2021-10-05 00:33:49 -03:00
silicons
f024318810 Merge pull request #14958 from WanderingFox95/WanderingFox95-TribalOverhaul 
Tribal Crafting Overhauled & Expanded
 2021-10-03 11:20:55 -07:00
Putnam3145
dc22e02a1b Removes minesweeper 2021-10-01 23:08:08 -07:00
Hatterhat
1d005db9a8 THE YEEHAW UPDATE 2021-09-30 23:10:33 -05:00
SandPoot
b23b88524d Upload files 2021-09-28 22:03:17 -03:00
WanderingFox95
fe8a652689 Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul 2021-09-19 21:32:03 +02:00
zerothebigboy
68e2eb1d7a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into prisoners 2021-09-10 12:12:57 -04:00
zerothebigboy
ccfde52b0d code 2021-09-02 23:45:03 -04:00
keronshb
47078e9a85 Ports Hair Gradiants 2021-08-26 11:58:09 -04:00
Artur
82ccfc40dc /obj/screen --> /atom/movable/screen 2021-07-29 13:57:19 +03:00
WanderingFox95
82d66bdd16 Removes unused code 2021-07-21 19:43:51 +02:00
WanderingFox95
cab3ae19d8 No longer exporting the slabs either. 2021-07-20 19:02:31 +02:00
silicons
5204f5a6d9 Merge pull request #13991 from Putnam3145/auxtools-atmos 
Replaces extools with auxtools; atmos overhaul
 2021-06-27 11:01:32 -07:00
Putnam3145
4ff019f56e Inelastic exports shouldn't process 2021-06-21 07:47:13 -07:00
Putnam3145
dbdc3001ba Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-06-16 23:33:14 -07:00
qweq12yt
0ca61af62a fixed combo lockers 2021-06-10 16:50:44 -03:00
Putnam
86177c51c4 auxgm part 1 
see also https://github.com/Baystation12/Baystation12/blob/dev/code/modules/xgm/xgm_gas_data.dm
 2021-06-08 09:54:28 -07:00
silicons
4afb5209a1 Merge pull request #14637 from TheObserver-sys/DerringerPass1 
Derringer Pass 1: No Rest for the Wicked(ly Bad Coder {me})
 2021-05-07 18:42:24 -06:00
The0bserver
f1109c4f67 what a crate day (initial commit) 2021-05-01 02:15:07 -04: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