shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
31,668 Commits 5 Branches 0 Tags
8db3a3ced4e4bbda69229c7e5ed4d1dc0cd8ca88
Commit Graph

2345 Commits

Author SHA1 Message Date
kevinz000
46823a127b Merge pull request #11335 from Ghommie/Ghommie-cit604 
Made flavor texts into an element datum, appliable to every atom.
 2020-03-10 17:26:20 -07:00
Ghom
ddc7d5cf12 Update flavor_text.dm 2020-03-10 17:28:31 +01:00
Ghommie
7578d60436 flavor texts unset on randomize, yay. 2020-03-10 15:11:16 +01:00
Ghommie
7ba120a8d3 lazyor 2020-03-10 14:12:11 +01:00
Ghommie
17007182c9 Merge branch 'Ghommie-cit604' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit604 2020-03-09 22:42:31 +01:00
Ghommie
aa8dc93a5d locate textref. 2020-03-09 22:27:27 +01:00
Ghommie
0587d3482d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit604 2020-03-09 21:53:22 +01:00
kevinz000
d7c5b87263 Update action.dm 2020-03-08 21:24:52 -07:00
Ghom
8878733fc1 Merge pull request #11317 from deathride58/WEPORTINSYNTHSBOI 
Ports Skyrat's synths (Plus limb rendering overhaul and more)
 2020-03-09 00:26:06 +01:00
Ghom
1cd9c19b4c Merge pull request #11288 from Trilbyspaceclone/patch-300 
[ready] Craftable Prescription & Sunglasses HUDs
 2020-03-09 00:01:12 +01:00
Ghom
bceed5d002 Update recipes_clothing.dm 2020-03-08 23:46:33 +01:00
kevinz000
c736568a5a Merge pull request #11369 from Ghommie/Ghommie-cit609 
Porting the musician and curator beacons.
 2020-03-08 07:34:48 -07:00
Ghom
a139f0adc6 Update flavor_text.dm 2020-03-08 01:38:42 +01:00
Ghom
991f9a75b7 Update flavor_text.dm 2020-03-08 01:33:02 +01:00
Ghom
d10f0b0e2f Update flavor_text.dm 2020-03-08 01:28:42 +01:00
Ghom
ec0d0f9ada Update flavor_text.dm 2020-03-08 01:27:14 +01:00
Ghom
213086ae9f Merge pull request #11345 from Citadel-Station-13/kevinz000-patch-12 
VV now internally always uses \ref instead of REF()
 2020-03-07 11:37:17 +01:00
kevinz000
02a488f507 Merge pull request #11340 from Ghommie/Ghommie-cit605 
Porting movespeed modifiers code updates.
 2020-03-07 03:26:48 -07:00
Ghommie
a817bd6115 Porting the musician and curator beacons. 2020-03-07 00:12:50 +01:00
Trilbyspaceclone
c2e56f156f Update recipes_weapon_and_ammo.dm 2020-03-06 17:18:10 -05:00
Kraseo
ad20fb1a0e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into contracties 2020-03-06 11:58:11 +01:00
kevinz000
c752661399 Update datumvars.dm 2020-03-06 01:51:20 -07:00
kevinz000
29727b2fc9 Merge pull request #11306 from Ghommie/Ghommie-cit598 
Removes makeshift switchblades
 2020-03-06 00:20:36 -07:00
kevinz000
16d6ba9e21 Merge pull request #11323 from Ghommie/Ghommie-cit600 
Porting a couple material datums code updates and fixes.
 2020-03-06 00:17:21 -07:00
kevinz000
9420424c8f Merge pull request #11332 from Ghommie/Ghommie-cit603 
Replaces EXCEPTION() with stack_trace() and CRASH()
 2020-03-06 00:14:13 -07:00
Ghommie
0c4af362bc Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit605 2020-03-06 04:00:36 +01:00
Ghommie
e484f72d7b Ports movespeed modifiers code updates. 2020-03-06 03:35:56 +01:00
deathride58
2e35c09dec Merge pull request #10451 from kevinz000/mobility_flags 
Mobility flags + combat rework stuff refactoring, fixes a few edge cases including the Oh Dreaded Xenomorph Hardstuns, etc etc time to break the game
 2020-03-05 20:03:56 -05:00
Ghommie
5ae7965744 Ok. 2020-03-05 22:06:48 +01:00
Ghommie
324f75c4db Makes the thing actually work. 2020-03-05 21:41:41 +01:00
Ghommie
6de290758b Oh, yea. 2020-03-05 19:07:24 +01:00
Ghommie
2cbdae2f0a Made flavor texts into an element datum. 2020-03-05 18:46:33 +01:00
Ghommie
bb7bfc04cc Replaces EXCEPTION() with stack_trace() and CRASH() 2020-03-05 01:47:04 +01:00
Ghom
d78cdb9b37 Merge pull request #11130 from BlackMajor/SpaceRuins 
Enables space ruin generation in the station z-level. Adds new ruins for the sake of station ruins.
 2020-03-04 23:46:10 +01:00
Ghom
7a2e0892d3 Merge pull request #11277 from kevinz000/sword_point 
En garde! (nah just sword pointing)
 2020-03-04 17:11:39 +01:00
Ghommie
f2c8a7cd6f Porting a couple material datums code updates and fixes. 2020-03-04 15:59:46 +01:00
Ghom
df5b4ab56d Merge pull request #11321 from kevinz000/storage_components_are_bad 
fixes storage closing while dragging, aka "this one line fix that i procrastinated giving a fuck about for about 9 months now"
 2020-03-04 14:31:09 +01:00
BlackMajor
43e77f7d3a Last few fixes. Adds arcane wand to dead wizard roid. 2020-03-04 19:12:56 +13:00
kevinz000
5e2414bd90 fix 2020-03-03 22:25:35 -07:00
kevinz000
2d02ae0077 oops 2020-03-03 21:06:29 -07:00
kevinz000
cbf2355f19 Update code/datums/elements/sword_point.dm 
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-03-03 21:06:05 -07:00
kevinz000
6354b48659 fix 2020-03-03 20:58:06 -07:00
deathride58
49ad376e5e Adds a very basic soft restriction system. There's definite room for improvement, but this is good enough for now. Am too hongry for this. 2020-03-03 17:44:10 -05:00
Ghom
81bb6978de Merge pull request #11250 from Seris02/risingbassnerf 
Rising bass nerfs and fixes
 2020-03-03 13:26:19 +01:00
Seris02
8c4c2842d0 fixes and code improvements 2020-03-03 19:27:09 +08:00
kevinz000
1e99cd0bfe Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-03-03 03:08:41 -07:00
Lin
fde24492b9 Merge pull request #11294 from Ghommie/Ghommie-cit596 
An old oversight with disease/var/viable_mobtypes.
 2020-03-02 18:31:25 -06:00
Ghommie
f08d79767b Removes makeshift switchblades 2020-03-02 19:33:31 +01:00
Kraseo
50a1feeb89 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into contracties 2020-03-02 17:38:08 +01:00
Ghom
9375113426 Merge pull request #11041 from Arturlang/kills_blood_tomatoe_succ 
Bloodsucker external blood gain rebalancing
 2020-03-02 16:36:22 +01:00