shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
43,584 Commits 5 Branches 0 Tags
f77495f45dd86786eaea199bc8274cdef2af42fb
Commit Graph

3639 Commits

Author SHA1 Message Date
Putnam3145
f77495f45d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-06-21 02:19:51 -07:00
silicons
3c7786dafd Merge pull request #14734 from keronshb/SpaceDragon 
(READY) Ports Space Dragon Midround Event.
 2021-06-18 20:03:43 -07:00
silicons
4768b23398 Merge pull request #14860 from Arturlang/nanite_updates 
Updates our nanite stuff to TG's, mostly
 2021-06-18 20:01:05 -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
silicons
687d0adf23 Merge remote-tracking branch 'citadel/master' into backend_sync 2021-06-16 19:04:07 -07:00
Lin
1e66357706 Merge pull request #14851 from Vynzill/spritinghell 
Extended Armwraps
 2021-06-16 11:30:01 -07:00
Timothy Teakettle
e12380cc40 Update embedded.dm (#14854) 2021-06-16 19:27:19 +02:00
Artur
724b34f55d https://github.com/tgstation/tgstation/pull/54710 2021-06-16 00:44:32 +03:00
Lin
70de0547ab Merge pull request #14713 from silicons/json_interface 
adds json topic api for manifest, players, revision, and status.
 2021-06-14 20:17:05 -07:00
Lin
4ae09baa63 Merge pull request #14834 from silicons/on_found 
Fixes on_found triggering on storage
 2021-06-14 20:15:42 -07:00
Vynzill
df72710cae herewego 2021-06-14 17:19:05 -05:00
silicons
6495bbcc81 Merge remote-tracking branch 'citadel/master' into backend_sync 2021-06-13 16:13:30 -07:00
silicons
a88561d1aa Merge pull request #14770 from keronshb/spaceadaptaura 
Changes Space Adapt to a proper animated outline so it doesn't look awful.
 2021-06-13 15:19:08 -07:00
silicons
8feb473e65 fixes 2021-06-12 04:49:23 -07:00
silicons
55e8d67521 refactor a bit 2021-06-12 04:41:58 -07:00
silicons
85b1125c83 fix 2021-06-12 04:36:02 -07:00
Putnam
833d34ba8e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-06-11 16:28:12 -07:00
Timothy Teakettle
e78929cde1 typo 2021-06-11 17:55:38 +01:00
Timothy Teakettle
baad78e7fe bee 2021-06-11 16:08:55 +01:00
silicons
816b09bf32 Merge remote-tracking branch 'citadel/master' into backend_sync 2021-06-10 22:36:26 -07:00
Putnam
3b25f3e199 Started expanding auxgm a bit 2021-06-10 04:40:23 -07:00
keronshb
ed929dda12 Changes up the animation a bit 2021-06-09 15:12:22 -04:00
silicons
eb4b4088f4 Merge pull request #14760 from keronshb/floorcluwneport 
Ports Floor Cluwnes and Cluwnes.
 2021-06-09 11:21:22 -07:00
silicons
c0e3b8d5ef Merge pull request #14809 from SandPoot/speak-nice-yes 
Centralizes borg speech and uses some of the icons for the typing indicator
 2021-06-09 11:15:01 -07: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
SandPoot
b0940456f5 upload files 2021-06-08 13:13:22 -03:00
Putnam
d03bf641dd extreme optimization project to maybe fix game 2021-06-06 21:58:24 -07:00
silicons
0d206742fa Update world_topic.dm 2021-06-01 21:35:49 -07:00
silicons
656d0545cd Update world_topic.dm 2021-06-01 01:32:54 -07:00
keronshb
70926f5daf Merge remote-tracking branch 'upstream/master' into floorcluwneport 2021-05-31 22:21:34 -04:00
silicons
71db9298a1 Update world_topic.dm 2021-05-28 18:21:46 -07:00
keronshb
c1a9f9cfe9 GLOW ANIMATION 2021-05-28 17:40:43 -04:00
keronshb
86a825bb9f Space Adapt outline 2021-05-28 15:57:16 -04:00
keronshb
8f1db2d5ec Fixes some stuff 
Actually ticks the spell, fixes the brain damage issue, etc.
 2021-05-27 12:16:54 -04:00
keronshb
78db6bd5c2 Ports Floor Cluwnes 
Oh fuck oh god
 2021-05-26 21:58:35 -04:00
zerothebigboy
36fe3fef76 abuse 2021-05-24 21:40:15 -04:00
silicons
0dd24d9de9 Update world_topic.dm 2021-05-21 19:35:46 -07:00
Putnam
e580c504fa Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-05-21 18:52:16 -07:00
silicons
f07d832cad Update world_topic.dm 2021-05-21 18:20:28 -07:00
silicons
f802890153 Update world_topic.dm 2021-05-16 22:17:50 -07:00
silicons
8ff0685f0d Update world_topic.dm 2021-05-15 18:28:00 -07:00
keronshb
a6ae645fc2 Space Dragon Fixes (#55759) 2021-05-14 12:32:48 -04:00
keronshb
2eba3ae383 [READY]New Side Antagonist: Space Dragon (#42551) 
* Add files via upload

* Rename space_dragon.dm to code/modules/events/space_dragon.dm

* Adds Space Dragon

* Adds Space Dragon Event

* Remove Copied File

* Put antagonist definition in proper location for space dragon

* Update space_dragon.dm

* Removed passive health regen from space dragon

* Updated Weight and Earliness for Space Dragon

* Added Objective to Space Dragon, Updated Starting Blurb

* Cleaned Up the Objective Determiner

* Actually fix the space dragon objectives

* Fix the objective display for the space dragon's target

* Updated Space Dragon Intro Blurb

* Updated Centcom Message When Space Dragon Spawns

* Updated Space Dragon's description with new lore

* Clean Up Space Dragon's OnFire()

* Add Space Dragon Sprites

* Sprite in wrong location

* Properly adds Space Dragon Sprites

* Adds Space Dragon Tiny Sprite to be Carp

* Space Dragon Uses New Sprites, Tiny Form Updated

* Increased Time Til' Dragon Spawn

* Drake's Tail Sweep Now Uses Prebuilt Spell

Thanks to Cobblestone for the head's up on this.
 2021-05-14 12:27:03 -04:00
silicons
55ee9a00b4 woo yeah woo yeah 2021-05-12 18:24:26 -07:00
silicons
8e2921f3c0 woo 2021-05-12 17:36:01 -07:00
silicons
59f160be57 woo 2021-05-12 16:59:48 -07:00
silicons
2a3a45573f woo 2021-05-12 16:58:17 -07:00
silicons
6237928c4b woo 2021-05-12 16:55:21 -07:00
silicons
0b9d021d9b woo 2021-05-12 16:51:28 -07:00
silicons
482be2ee0d okay 2021-05-12 16:37:13 -07:00