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

2607 Commits

Author SHA1 Message Date
silicons
08f251a88c Merge remote-tracking branch 'citadel/master' into combat_v7 2021-06-27 10:44: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
ae6a648c4b Merge pull request #14869 from bunny232/21/79-the-finale 
21/79 the finale now with less map merge issues woops
 2021-06-18 20:02:07 -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
84068b467a Merge pull request #14658 from silicons/backend_sync 
Updates tgui and build backend, fixes the build.bat for those with latest eslint (?)
 2021-06-18 17:23:35 -07:00
bunny232
fb9cc6fe45 Update atmospherics.dm 2021-06-18 05:25:02 -04:00
Putnam3145
5d574acdc2 Merge pull request #14794 from Citadel-Station-13/silicons-patch-35 
updates GLOB.flags to the new byond limit of 24 flags in one variable, up from 16.
 2021-06-18 00:47:07 -07:00
silicons
c1928c9446 Merge remote-tracking branch 'citadel/master' into combat_v7 2021-06-16 19:04:16 -07:00
silicons
687d0adf23 Merge remote-tracking branch 'citadel/master' into backend_sync 2021-06-16 19:04:07 -07:00
Artur
f3e16b298b https://github.com/tgstation/tgstation/pull/56588 2021-06-16 01:15:21 +03:00
Artur
724b34f55d https://github.com/tgstation/tgstation/pull/54710 2021-06-16 00:44:32 +03:00
silicons
66dde6f9ea woo 2021-06-14 14:00:02 -07:00
silicons
01e0fa16fe it works. 2021-06-14 13:52:48 -07:00
silicons
8595e05ad9 Merge remote-tracking branch 'citadel/master' into combat_v7 2021-06-13 15:37:35 -07:00
silicons
55e8d67521 refactor a bit 2021-06-12 04:41:58 -07:00
silicons
816b09bf32 Merge remote-tracking branch 'citadel/master' into backend_sync 2021-06-10 22:36:26 -07:00
silicons
5e4f3ed694 Merge pull request #14683 from keronshb/shovedisarmgun 
Off Balance Disarms only if shoved into a wall or person.
 2021-06-09 12:14:37 -07:00
keronshb
33affb4f10 THREE SECONDS 2021-06-09 15:14:07 -04:00
silicons
a77aa8bd41 Merge pull request #14766 from Linzolle/cultfix 
Fix cult area shenanigans, cult can do stuff in maint again.
 2021-06-09 11:22:26 -07:00
silicons
eb4b4088f4 Merge pull request #14760 from keronshb/floorcluwneport 
Ports Floor Cluwnes and Cluwnes.
 2021-06-09 11:21:22 -07:00
silicons
b28d4f26f3 Merge pull request #14803 from bunny232/airmixies 
21/79 not 20/80
 2021-06-09 11:18:10 -07:00
silicons
eaf36d3137 Update _flags.dm 2021-06-09 11:16:55 -07:00
silicons
fe8323f503 Merge pull request #14747 from keronshb/reinforcedplasmawindowsteps 
Adds more deconstruction steps to stronger windows.
 2021-06-09 11:13:13 -07:00
silicons
40f2c06f2e Merge remote-tracking branch 'citadel/master' into combat_v7 2021-06-07 16:47:11 -07:00
bunny232
26544ddbb7 21/79 not 20/80 2021-06-06 17:24:10 -04:00
silicons
829944640e Update _flags.dm 2021-06-04 09:24:15 -07:00
keronshb
70926f5daf Merge remote-tracking branch 'upstream/master' into floorcluwneport 2021-05-31 22:21:34 -04:00
Linzolle
46833abf0b add cult_permitted area flag 2021-05-27 19:34:00 -05: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
9e3c1ff860 adds floor cluwnes from yog 2021-05-24 22:46:59 -04:00
zerothebigboy
36fe3fef76 abuse 2021-05-24 21:40:15 -04:00
keronshb
bd05dd29b6 ReinforcedPlasmaSteps 
Adds more steps for deconning stronger windows
 2021-05-22 13:58:01 -04:00
keronshb
b8b25662ff Couple of fixes, almost ready to go 2021-05-18 22:12:02 -04:00
keronshb
d2f69acaf8 Space Dragon Event 
Ports the Space Dragon event
 2021-05-18 12:06:32 -04:00
silicons
5601badbff deterministic explosion system (#13392) 
* wae explosions

* okay

* changes

* fixes

* fix

* ok

* ok

* kills more dead code

* okay

* fix

* ok

* tiles

* ok

* okay

* woops

* ok

* fix

* okay

* mob damage

* fixes

* insanity

* more

* more

* fixes

* more

* woot

* don't commit that

* YES

* fix
 2021-05-12 05:44:53 -05:00
keronshb
11a7e118fe Puts off balance duration to 2 seconds 
Might be better at 2.
 2021-05-07 23:58:09 -04:00
keronshb
7947258e51 Off balance disarm 
If it hits a wall or a person while under the effect of off balance.
 2021-05-05 23:57:01 -04:00
keronshb
be2e962983 Off Balance for Guns only again 
Was intended for guns
 2021-05-04 00:51:16 -04:00
SandPoot
8f3a44f44a fancy gateway 2021-05-02 18:57:04 -03:00
silicons
4289b8be1e Merge remote-tracking branch 'citadel/master' into backend_sync 2021-04-28 22:34:17 -07: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
silicons
fefb33454f do that too 2021-04-28 16:16:55 -07:00
silicons
275b532a8c Merge remote-tracking branch 'citadel/master' into combat_v7 2021-04-26 14:17:43 -07:00
SandPoot
5bb6078def upload files 2021-04-22 20:39:21 -03:00
necromanceranne
0f04bbb23b Ports a significant amount of the tg cybernetic organ code while making some additional changes to their power 2021-04-22 13:06:31 +10:00
necromanceranne
75e0e893a2 Merge branch 'master' into baton_change_pr 2021-04-19 10:55:33 +10:00
silicons
0dcc6b44ba Merge pull request #14543 from qweq12yt/cargo-bugfixes 
Cargo bugfixes
 2021-04-18 18:52:54 -06:00
silicons
cd9ccb82d7 Merge pull request #14594 from DrPainis/patch-7 
Makes insect blood not look like diarrhea.
 2021-04-18 18:49:43 -06:00
silicons
e8e625cb5c Merge pull request #14603 from Putnam3145/fix-base-option 
Activity tracking; traitor class tweaks
 2021-04-18 18:49:27 -06:00
silicons
02f4bd8f3a Merge pull request #14591 from zeroisthebiggay/deathrattles 
ports deathrattle implants but without mob statchange because i am not gonna port that today
 2021-04-18 18:48:08 -06:00