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

2419 Commits

Author SHA1 Message Date
CitadelStationBot
d29bae26e0 Merge pull request #3954 from Citadel-Station-13/upstream-merge-32737 
[MIRROR] Fixes AI door hotkeys & other weirdness
 2017-11-15 11:08:25 -06:00
CitadelStationBot
e83b175f30 Merge pull request #3953 from Citadel-Station-13/upstream-merge-32729 
[MIRROR] removes an unused var from radio code
 2017-11-15 11:05:19 -06:00
CitadelStationBot
607294a2b6 Merge pull request #3952 from Citadel-Station-13/upstream-merge-32630 
[MIRROR] Alternative grille sprite update
 2017-11-15 11:02:04 -06:00
LetterJay
a8d73f8ec2 Merge pull request #3948 from Citadel-Station-13/upstream-merge-32726 
[MIRROR] Removes some attackby crowbar checks on nuclear bombs and camera assemblies
 2017-11-15 10:51:04 -06:00
LetterJay
f45006ef57 Merge pull request #3947 from Citadel-Station-13/upstream-merge-32719 
[MIRROR] Fixes a runtime with glowshrooms
 2017-11-15 10:41:41 -06:00
LetterJay
163ef812fb Merge pull request #3945 from Citadel-Station-13/upstream-merge-32702 
[MIRROR] Minor speedups to movement: First Blood Part 2
 2017-11-15 10:41:16 -06:00
LetterJay
2f71e0f724 Merge pull request #3944 from Citadel-Station-13/upstream-merge-32714 
[MIRROR] Tesla no longer NOTHING PERSONNEL's the power beacon
 2017-11-15 10:40:59 -06:00
LetterJay
46ba6cbc7b Merge pull request #3943 from Citadel-Station-13/upstream-merge-32620 
[MIRROR] Greatly increases the performance of station-ending plasma fires
 2017-11-15 10:40:40 -06:00
LetterJay
16019df886 Merge branch 'master' into upstream-merge-32280 2017-11-15 10:21:04 -06:00
AnturK
13ebff97df Fixes AI door hotkeys & other weirdness 2017-11-15 02:03:17 -06:00
oranges
156aa30c61 Merge pull request #32729 from Qustinnus/cheapGBP 
removes an unused var from radio code
 2017-11-15 01:27:24 -06:00
Matt Smith
c4789d497a Alternative grille sprite update (#32630) 
* Update grille sprite

* Add damaged grille sprite

* Add 4 varients to the damaged grille
 2017-11-14 23:55:25 -06:00
Leo
4d1ea753c3 Removes some attackby crowbar checks on nuclear bombs and camera assemblies (#32726) 2017-11-14 17:44:49 -06:00
LetterJay
66445eb80b Update syndicatebeacon.dm 2017-11-14 16:07:26 -06:00
LetterJay
ccc9158819 Update station_alert.dm 2017-11-14 16:06:54 -06:00
LetterJay
809951c56c Merge pull request #3326 from Citadel-Station-13/upstream-merge-31176 
[MIRROR] loc -- > forcemove
 2017-11-14 15:58:20 -06:00
LetterJay
62c7cfc4e7 Merge pull request #3938 from Citadel-Station-13/upstream-merge-32689 
[MIRROR] Fixes a bunch of hand tele/portal issues.
 2017-11-14 15:56:08 -06:00
LetterJay
aea2e8716d Merge pull request #3937 from Citadel-Station-13/upstream-merge-32636 
[MIRROR] Heirophant Relay sprites
 2017-11-14 15:55:55 -06:00
LetterJay
528255833f Merge pull request #3935 from Citadel-Station-13/upstream-merge-32684 
[MIRROR] Fix the station integrity report to read the correct Z
 2017-11-14 15:54:44 -06:00
LetterJay
7fa3a16a0b Merge pull request #3934 from Citadel-Station-13/upstream-merge-32598 
[MIRROR] Cult Scaling Refactor
 2017-11-14 15:54:08 -06:00
LetterJay
19abbdfd5f Merge pull request #3931 from Citadel-Station-13/upstream-merge-32685 
[MIRROR] Little things 2 Revenge of atmos components
 2017-11-14 15:52:32 -06:00
LetterJay
d9ce438bbb Merge pull request #3929 from Citadel-Station-13/upstream-merge-32656 
[MIRROR] Directional computer sprites
 2017-11-14 15:51:35 -06:00
LetterJay
829d981fa5 Merge pull request #3928 from Citadel-Station-13/upstream-merge-32594 
[MIRROR] Update AI Airlock UI to use TGUI
 2017-11-14 15:51:18 -06:00
LetterJay
bbef661092 Merge pull request #3927 from Citadel-Station-13/upstream-merge-32481 
[MIRROR] [READY]integrated circuitry port+upgrade.
 2017-11-14 15:51:03 -06:00
MoreRobustThanYou
a970bc2283 Fixes a runtime with glowshrooms (#32719) 2017-11-14 15:36:53 -06:00
vuonojenmustaturska
8136148303 Minor speedups to movement: First Blood Part 2 2017-11-14 15:00:45 -06:00
LetterJay
c3b60e502e Merge pull request #3882 from Citadel-Station-13/upstream-merge-32371 
[MIRROR] SSoverlay improvements and tweaks
 2017-11-14 14:56:34 -06:00
Robustin
6a0b00ead6 Tesla no longer NOTHING PERSONNEL's the power beacon 2017-11-14 14:13:27 -06:00
vuonojenmustaturska
157998e974 Greatly increases the performance of station-ending plasma fires 2017-11-14 13:51:45 -06:00
kevinz000
eba429f5b1 Hand teleporter and portal fixes. (#32689) 2017-11-14 13:11:55 -06:00
LetterJay
8868a354b6 Update multitool.dm 2017-11-14 13:06:43 -06:00
KorPhaeron
594da93554 Heirophant Relay sprites (#32636) 2017-11-14 13:04:34 -06:00
Tad Hardesty
aa8581d430 Fix the station integrity report to read the correct Z 
Fixes a bug where the integrity of CentCom was being taken instead,
coming out at about 85% no matter what happened during the round. Also
removes the gang territory calculation now that it isn't used anywhere.
 2017-11-14 12:45:47 -06:00
Robustin
bd0cbee581 Cult pop scaling refactor (#32598) 2017-11-14 07:44:28 -06:00
Jalleo
23983c48bf Old debug objects which one has been replaced and another nobody needs at the moment. Also removal of comments that I forgot to removal at _machinery.dm (#32685) 2017-11-14 05:01:25 -06:00
ike709
a23935c037 Directional computer sprites (#32656) 
Technically I did fix it. It just wasn't a good fix. That's a good description of most of my coding.
 2017-11-14 05:01:09 -06:00
Matt Smith
d486d784ad Update AI Airlock UI to use TGUI 2017-11-14 05:00:58 -06:00
arsserpentarium
d8847ea167 [READY]integrated circuitry port+upgrade. 2017-11-14 05:00:48 -06:00
LetterJay
36778e9404 Merge pull request #3919 from Citadel-Station-13/upstream-merge-32623 
[MIRROR] Adds ambience for Reebe.
 2017-11-13 11:53:21 -06:00
LetterJay
648477ebe1 Merge pull request #3917 from Citadel-Station-13/upstream-merge-32637 
[MIRROR] Adds a timer to falsewall code
 2017-11-13 11:53:08 -06:00
LetterJay
304cfeb262 Merge pull request #3914 from Citadel-Station-13/upstream-merge-31947 
[MIRROR] Pirate ship event
 2017-11-13 11:52:40 -06:00
LetterJay
07cb443ba0 Merge pull request #3913 from Citadel-Station-13/upstream-merge-32553 
[MIRROR] Xrays go through walls but stop on mobs/blob
 2017-11-13 11:51:59 -06:00
LetterJay
32bfa75c3a Merge pull request #3908 from Citadel-Station-13/upstream-merge-32558 
[MIRROR] Prevent placing posters on diagonal wall corners
 2017-11-13 11:50:36 -06:00
LetterJay
a21a5cf30d Merge pull request #3906 from Citadel-Station-13/upstream-merge-32640 
[MIRROR] Adds a multitool_act and a proper check on tool_check
 2017-11-13 11:46:41 -06:00
LetterJay
0a21e6e83b Merge pull request #3904 from Citadel-Station-13/upstream-merge-32642 
[MIRROR] Makes clown box consistent with the rest of the boxes
 2017-11-13 11:45:13 -06:00
LetterJay
228aed8b35 Merge pull request #3902 from Citadel-Station-13/upstream-merge-32546 
[MIRROR] Refactor of base machinery a tiny bit more. DONE
 2017-11-13 11:44:46 -06:00
LetterJay
0d65074f44 Merge pull request #3899 from Citadel-Station-13/upstream-merge-32635 
[MIRROR] Fixes fleeing the station message accuracy
 2017-11-13 11:44:16 -06:00
LetterJay
4142105fe6 Merge pull request #3895 from Citadel-Station-13/upstream-merge-32435 
[MIRROR] Disposal pipes and pipe dispensers refactor
 2017-11-13 11:44:04 -06:00
LetterJay
9a80e5f91c Merge pull request #3893 from Citadel-Station-13/upstream-merge-32582 
[MIRROR] Fixes 512 compile reminders
 2017-11-13 11:42:40 -06:00
LetterJay
9ff35c5b2c Merge branch 'master' into upstream-merge-32435 2017-11-13 11:30:06 -06:00