shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
8456b3f709974b2359503658aea7d1622e64dc8b
GS13NG/code/datums
History
zerothebigboy 8456b3f709 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum 
# Conflicts:
#	icons/mob/clothing/head.dmi
#	icons/mob/clothing/mask.dmi
#	icons/mob/clothing/suit.dmi
#	icons/obj/clothing/hats.dmi
#	icons/obj/clothing/masks.dmi
#	icons/obj/clothing/suits.dmi
2021-03-19 14:30:05 -04:00
..
achievements
missing icon fix & stop throwing out parts
2021-03-05 19:29:52 +08:00
actions
fun
2021-02-09 17:31:24 -05:00
brain_damage
ASYNC EVERYTHING!
2020-12-21 16:24:51 +08:00
components
Merge branch 'master' into void-but-for-real
2021-03-12 23:10:19 -08:00
diseases
Merge branch 'master' of https://github.com/raspy-on-osu/Citadel-Station-13 into ventcrawl-refactor
2021-01-24 19:21:24 -05:00
elements
Merge pull request #14085 from Citadel-Station-13/silicons-patch-24
2021-01-26 22:24:57 -08:00
helper_datums
fixes
2021-01-05 23:18:52 +00:00
looping_sounds
Merge branch 'master' into void-but-for-real
2021-03-09 12:29:50 -08:00
martial
makes chokehold mute
2021-02-27 22:18:44 -08:00
materials
mapmerge update + mats properly work
2021-03-05 15:38:35 +08:00
mood_events
…
mutations
…
ruins
…
skills
updates fork
2021-02-17 12:03:28 -05:00
status_effects
adds domain expansion
2021-03-11 21:26:58 -08:00
traits
Merge pull request #14347 from timothyteakettle/language-tab
2021-03-16 20:31:58 +01:00
weather
Merge branch 'master' into void-but-for-real
2021-03-12 23:10:19 -08:00
wires
upload files
2021-02-18 15:05:39 -03:00
wounds
monke getting wounded *pain's lmao
2021-02-18 15:55:23 +01:00
accents.dm
…
action.dm
Makes cursed heart more tolerable
2021-01-07 22:27:13 +02:00
ai_laws.dm
…
armor.dm
…
beam.dm
…
beepsky_fashion.dm
…
browser.dm
…
callback.dm
a
2021-03-05 14:29:36 +08:00
chatmessage.dm
…
cinematic.dm
Immursive Audio 2
2020-12-24 11:06:49 +08:00
dash_weapon.dm
…
datacore.dm
…
datum.dm
Immursive Audio 2
2020-12-24 11:06:49 +08:00
datumvars.dm
fixes
2021-01-09 14:56:29 -08:00
dna.dm
…
dog_fashion.dm
…
ductnet.dm
…
emotes.dm
emote over holopad
2020-12-13 22:18:54 +00:00
ert.dm
…
explosion.dm
Merge remote-tracking branch 'citadel/master' into ex_act_3
2021-01-20 15:15:10 -07:00
forced_movement.dm
…
holocall.dm
ASYNC EVERYTHING!
2020-12-21 16:24:51 +08:00
http.dm
…
hud.dm
…
mind.dm
…
mutable_appearance.dm
…
numbered_display.dm
…
outfit.dm
…
position_point_vector.dm
…
profiling.dm
…
progressbar.dm
…
radiation_wave.dm
…
recipe.dm
…
ruins.dm
…
saymode.dm
…
shuttles.dm
final fix
2021-03-08 13:24:28 +08:00
soullink.dm
…
spawners_menu.dm
…
tgs_event_handler.dm
BSQL is fucking dead
2020-12-31 15:52:48 +08:00
verbs.dm
…
view.dm
oops! All Refactors!
2021-02-12 11:07:58 +08:00
weakrefs.dm
…
world_topic.dm
Merge remote-tracking branch 'origin/master' into hardsync-1.5
2021-03-03 17:09:01 +08:00