shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
39,314 Commits 5 Branches 0 Tags
e2fe97e86a6731fdd121caae8fb3cb192592164c
Commit Graph

631 Commits

Author SHA1 Message Date
DeltaFire15
91584053f5 Fixes a bunch of fallout from the tgui PR (#13648) 
* screamies

fixes a bunch of fallout from the tgui PR.. probably

* Empty commit to poke travis
 2020-11-01 21:59:22 +01:00
BlueWildrose
6080253759 Fixes cloning computer UI not updating when pressing certain buttons - also adds extra check for names to update a message (#13549) 
* fixes cloning computer UI not updating when pressing certain buttons

* forgot a few things
 2020-10-15 12:54:22 +02:00
silicons
19f1e99a8c mass ports like 15 tg prs + counting (#13386) 
* changes

* ok

* changes

* sigh

* fixes

* changes

* fix

* fix

* alright

* fixes
git pus

* fix

* fix

* fix

* test

* ok

* Update code/modules/paperwork/ticketmachine.dm

Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>

* ok

* compile and other stuff

* ok

* fix

* fix

* Fix

* Update menu.dm

* Update view.dm

* Update preferences.dm

Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
 2020-10-10 12:20:33 +02:00
silicons
8b36cf6f64 Merge pull request #13375 from timothyteakettle/emp-rework 
the emp rework (emp severity reduces as you move from epicentre, severity is 1-100)
 2020-10-01 03:01:18 -07:00
Blue Wildrose
81e9d34684 I love having my ears assaulted by 50 minesweeper_menuselect.oggs 2020-09-11 09:34:56 -07:00
Timothy Teakettle
f1cd94fc97 emp rework 2020-09-09 23:14:06 +01:00
Letter N
6ba29acd4e uses some cit procs. and how the fuck did i forget to componentualize this 2020-08-22 16:08:05 +08:00
Letter N
2dd3d71b19 config&copypaste chang. 2020-08-20 16:36:24 +08:00
Letter N
3b7bca28b3 Functional* code 2020-08-20 13:50:33 +08:00
Letter N
71bf63d0dd this is needed 2020-08-07 14:06:14 +08:00
Letter N
c6c78667cb atmo control fix 2020-08-07 13:58:08 +08:00
Letter N
454baea55f Merge remote-tracking branch 'origin/master' into TGUI-4 2020-08-04 09:31:34 +08:00
Letter N
a19e306137 less redtext - updates anomalies 2020-08-03 20:53:36 +08:00
Letter N
b376a6b6c4 Merge remote-tracking branch 'origin/master' into TGUI-4 2020-07-30 14:43:52 +08:00
silicons
e4148fe4ad Merge remote-tracking branch 'citadel/master' into 12742 2020-07-29 01:11:11 -07:00
Letter N
22d5aebaa5 second batch - MAJOR: mech_fab, turrets 2020-07-24 14:38:04 +08:00
Letter N
d5a6a3ecd9 actual code chang 2020-07-22 12:02:31 +08:00
silicons
f3efa19436 Merge remote-tracking branch 'citadel/master' into 12742 2020-07-21 11:25:26 -07:00
silicons
98d3ac80d9 :pika: 2020-07-20 11:25:17 -07:00
Lin
ba3dc6a73b Merge pull request #12679 from silicons/unarmed_parry 
Ok ok hear me out: Implements unarmed parry.
 2020-07-18 17:02:02 -05:00
silicons
a8e2b84ad8 Merge pull request #12763 from zeroisthebiggay/b 
hopefully fixes records possibly
 2020-07-17 17:10:40 -07:00
silicons
993b4ec222 Merge remote-tracking branch 'citadel/master' into unarmed_parry 2020-07-16 19:39:46 -07:00
Artur
c964cadd85 Makes amber alert work 2020-07-14 16:15:32 +03:00
zerothebigboy
5b3050f692 b 2020-07-13 17:01:41 -04:00
zerothebigboy
4c0248835f b 2020-07-13 17:01:23 -04:00
zerothebigboy
85f8491003 b 2020-07-13 14:45:18 -04:00
Artur
5f9364c5f8 Merge remote-tracking branch 'Upstream/master' into TGUI-3.0 2020-07-13 16:20:54 +03:00
Keate Senior
80b4c03c82 Initial changes to get this to github for public reviewing 
-Removes the Reebe z level and puts it on the cc z level
-Replaces the Neovgre mech stepsound
-Moves spacial gateway into drivers so the cult isn't stuck stationside
-Adds the Belligerant scripture, which applies the Belligerant status effect to non-clankers in range
-Various other changes currently commented out for later work on them.
-removes the abductor teleport cameras from Reebe
-adds a Brass multitool, essentially just an advanced multitool with a special sprite.
-makes clockcult armor have 0 laser defense normally and 10 defense when the ark is almost done summoning Ratvar instead of -25 --> -15
-Makes spear recalling worded to support the addition of new weapons to summon
-Adds new structures for power generation and shuttle delaying
-Other changes I've probably forgotton, but are too lazy to scrounge through the code at 12:43 AM
 2020-07-12 00:43:54 -04:00
silicons
4f4c6b85bf Merge pull request #12720 from timothyteakettle/eye-contact 
port examines and eye contact
 2020-07-11 00:14:47 -07:00
Artur
9de8483bcf Merge remote-tracking branch 'Upstream/master' into TGUI-3.0 2020-07-09 22:14:20 +03:00
Timothy Teakettle
02f46322ad port examine 2020-07-09 18:32:45 +01:00
Putnam
a625d6562b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real 2020-07-08 22:02:03 -07:00
silicons
6cbab55ef8 Merge remote-tracking branch 'citadel/master' into unarmed_parry 2020-07-07 21:07:58 -07:00
silicons
6ee63f66aa whew 2020-07-07 20:48:54 -07:00
Ghommie
afb5b5237c linter & stuff. 2020-07-06 22:42:32 +02:00
Ghommie
562b57095d mowing down the experimental cloner copypasta. 2020-07-05 03:04:53 +02:00
Ghommie
780f30bd4d Fixing cloning 2020-07-04 21:01:44 +02:00
Artur
82c6a02feb More Testmerge fixes 2020-07-03 15:34:45 +03:00
Artur
7781296fb9 DNA CONSOLE FIX 2020-07-03 11:09:55 +03:00
Artur
365aadec54 Trying to fix the dna t 2020-07-03 00:55:18 +03:00
Artur
6ee1eba56c Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-07-02 23:23:47 +03:00
Artur
20245f7319 Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-06-30 02:30:29 +03:00
Ghommie
9dc4b99620 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-06-30 00:49:06 +02:00
Ghommie
ae053a9a08 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit800 2020-06-23 03:12:49 +02:00
Ghommie
de77b7139c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-06-23 00:13:14 +02:00
Artur
c41d2e78be Conflicts!!! 2020-06-22 17:39:24 +03:00
kevinz000
1b5ea90c8f sigh 2020-06-18 08:16:05 -07:00
SmArtKar
46c3e9e54d Shuttles 2020-06-16 18:16:14 +03:00
Artur
390419cfaa Stupid mistake 2020-06-16 17:21:46 +03:00
Artur
19f215477e Merge remote-tracking branch 'upstream/master' into TGUI-3.0 2020-05-30 18:52:02 +03:00