shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,204 Commits 5 Branches 0 Tags
e8bb77ba2c70fe77ecc719d136365153c2be1797
Commit Graph

5052 Commits

Author SHA1 Message Date
kevinz000
e8bb77ba2c Merge pull request #3387 2017-10-14 13:35:04 -07:00
LetterJay
dd18caa84e Merge pull request #3386 from Citadel-Station-13/upstream-merge-31670 
[MIRROR] IC Issue also tells the ahelper that their ticket has been resolved
 2017-10-14 16:20:30 -04:00
LetterJay
21ec35da1c Merge pull request #3385 from Citadel-Station-13/upstream-merge-31668 
[MIRROR] Fixes slapping while restrained/etc...
 2017-10-14 16:20:13 -04:00
LetterJay
c10ff48ced Merge pull request #3384 from deathride58/noncentcomobjectives 
Axes edglines from security objective
 2017-10-14 16:09:16 -04:00
LetterJay
0ee34c7b3d Merge pull request #3383 from Citadel-Station-13/upstream-merge-31662 
[MIRROR] Removes unused list
 2017-10-14 15:41:09 -04:00
LetterJay
581ea5ac48 Merge pull request #3382 from Citadel-Station-13/upstream-merge-31655 
[MIRROR] Slight change to the behavior of Assimilate_Air()
 2017-10-14 15:38:21 -04:00
LetterJay
2d32e5f782 Merge pull request #3381 from Citadel-Station-13/upstream-merge-31693 
[MIRROR] FIXES the NOT FIXED donk pocket issue by FIXING in some omnizine on grind
 2017-10-14 15:38:10 -04:00
LetterJay
1e01c696b4 Merge pull request #3380 from Citadel-Station-13/upstream-merge-31454 
[MIRROR] New Chaplain Weapon: Hammer of Pride!
 2017-10-14 15:38:01 -04:00
LetterJay
253f1e3f1c Merge pull request #3379 from Citadel-Station-13/upstream-merge-30570 
[MIRROR] Flying mobs now clip past non flying mobs, various flightsuit/iontrail/movement tweaks/code improvements/bugfixes
 2017-10-14 15:37:17 -04:00
LetterJay
45619b0e1b Merge pull request #3365 from Citadel-Station-13/upstream-merge-31601 
[MIRROR] Fix many instances of "the the"
 2017-10-14 15:37:00 -04:00
LetterJay
c056349055 Update flightsuit.dm 2017-10-14 13:57:22 -05:00
Jordan Brown
ccb0674988 Fixes the last Href Token issues (#31666) 2017-10-14 11:46:01 -05:00
LetterJay
47df292c54 Update angel.dm 2017-10-14 09:23:46 -05:00
LetterJay
1fcfa019f3 Update species.dm 2017-10-14 09:23:24 -05:00
LetterJay
49ffb814d5 Update flightsuit.dm 2017-10-14 09:23:01 -05:00
LetterJay
87e8c66d5f Merge pull request #3378 from Citadel-Station-13/upstream-merge-31649 
[MIRROR] Fixes invisible wirecutters and made screwdrivers easier to see in DM
 2017-10-14 10:21:27 -04:00
LetterJay
0397bd57c1 Merge pull request #3377 from Citadel-Station-13/upstream-merge-31604 
[MIRROR] Adds Toggle Underline button to PDA menu
 2017-10-14 10:21:19 -04:00
LetterJay
dce56e3951 Merge pull request #3376 from Citadel-Station-13/upstream-merge-31598 
[MIRROR] Smoke Machine Updates & Fixes
 2017-10-14 10:21:09 -04:00
LetterJay
27bd0ffebb Merge pull request #3374 from Citadel-Station-13/upstream-merge-31635 
[MIRROR] Small lighting perf tweak
 2017-10-14 10:20:36 -04:00
LetterJay
c442f49cde Merge pull request #3373 from Citadel-Station-13/upstream-merge-31645 
[MIRROR] Cleans up explosives at syndie base
 2017-10-14 10:20:27 -04:00
LetterJay
4b48651380 Merge pull request #3372 from Citadel-Station-13/upstream-merge-31646 
[MIRROR] You can now drag-drop people into open DNA scanners
 2017-10-14 10:20:11 -04:00
LetterJay
fea2807378 Merge pull request #3371 from Citadel-Station-13/upstream-merge-31648 
[MIRROR] Medibots will no longer inject people in lockers/sleepers/etc
 2017-10-14 10:19:52 -04:00
LetterJay
5bbf3b9735 Merge pull request #3370 from Citadel-Station-13/upstream-merge-31620 
[MIRROR] Fixes various Nanotrasen capitalizations
 2017-10-14 10:19:15 -04:00
LetterJay
9aa87f73c8 Merge pull request #3369 from Citadel-Station-13/upstream-merge-31628 
[MIRROR] Various examine grammar fixes
 2017-10-14 10:19:01 -04:00
LetterJay
f7123f0f4b Merge pull request #3368 from Citadel-Station-13/upstream-merge-31623 
[MIRROR] Fixes Shambrero Penguin Names
 2017-10-14 10:18:43 -04:00
LetterJay
2e61af534e Merge pull request #3366 from Citadel-Station-13/upstream-merge-31420 
[MIRROR] Bullet decals tweak
 2017-10-14 10:17:18 -04:00
LetterJay
d6903bcf3c Merge branch 'master' into upstream-merge-31601 2017-10-14 10:17:16 -04:00
Leo
506324fbec Merge pull request #31670 from tgstation/Cyberboss-patch-3 
IC Issue also tells the ahelper that their ticket has been resolved
 2017-10-14 09:07:03 -05:00
Leo
635e430ec6 Merge pull request #31668 from tgstation/Cyberboss-patch-2 
Fixes slapping while restrained/etc...
 2017-10-14 09:05:49 -05:00
deathride58
5ea5dc40df hos ded 2017-10-14 03:42:08 -04:00
AnturK
f6f114af12 Removes unused list (#31662) 2017-10-14 00:50:35 -05:00
oranges
dd8fb2a5ad Merge pull request #31655 from duncathan/atmos-patch1 
Slight change to the behavior of Assimilate_Air()
 2017-10-13 23:50:05 -05:00
oranges
5fdaba2b0e Merge pull request #31693 from Armhulen/patch-12 
FIXES the NOT FIXED donk pocket issue by FIXING in some omnizine on grind
 2017-10-13 23:49:54 -05:00
Armhulen
cf155736cf New Chaplain Weapon: Hammer of Pride! (#31454) 
* cool beans

* i think this works

* i'm only human after all

don't put the blame on me

* is this what you wanted??

* ya

* K
 2017-10-13 23:44:39 -05:00
LetterJay
8aebc3b15a Merge pull request #3364 from Citadel-Station-13/upstream-merge-30909 
[MIRROR] Radiation rework and subsystem
 2017-10-13 23:58:04 -04:00
LetterJay
c28932e4d4 Update displaycase.dm 2017-10-13 22:57:31 -05:00
LetterJay
243e9d7acb Merge pull request #3362 from Citadel-Station-13/upstream-merge-31608 
[MIRROR] Fixes explosion particles causing a massive amount of runtimes
 2017-10-13 23:37:55 -04:00
LetterJay
e18e99f56f Merge pull request #3361 from Citadel-Station-13/upstream-merge-31614 
[MIRROR] Fixes electrocution animation
 2017-10-13 23:37:46 -04:00
LetterJay
64b04b2c2f Merge pull request #3352 from Citadel-Station-13/upstream-merge-31631 
[MIRROR] Use legacy topic keywords lookup method
 2017-10-13 23:36:19 -04:00
LetterJay
aed26b120c Merge pull request #3350 from Citadel-Station-13/upstream-merge-31584 
[MIRROR] Fixes ruins spawning over shuttle docks
 2017-10-13 23:36:10 -04:00
LetterJay
66585f242c Merge pull request #3345 from Citadel-Station-13/upstream-merge-31512 
[MIRROR] Refactors away mission & space ruin area code.
 2017-10-13 23:36:01 -04:00
LetterJay
8360e8afd1 Merge pull request #3339 from Citadel-Station-13/upstream-merge-31557 
[MIRROR] Cleans up some direct loc setting-s in single tank bombs
 2017-10-13 23:35:52 -04:00
LetterJay
80eefdd6a0 Update collector.dm 2017-10-13 22:32:45 -05:00
LetterJay
732dc95c14 Update kitchen_spike.dm 2017-10-13 22:32:32 -05:00
LetterJay
c5abf8b01f Update hivebot.dm 2017-10-13 22:32:10 -05:00
LetterJay
3df2049f44 Update teleportation.dm 2017-10-13 22:31:10 -05:00
LetterJay
de20eb645c Update robot_items.dm 2017-10-13 22:30:41 -05:00
kevinz000
77d6420db0 Flying mobs now clip past non flying mobs, various flightsuit/iontrail/movement tweaks/code improvements/bugfixes 2017-10-13 19:09:45 -05:00
ShizCalev
ac660b6e3e Invisible wirecutters and made screwdrivers hivis (#31649) 2017-10-13 18:35:58 -05:00
AlecW
482e61a57e Adds Toggle Underline button to PDA menu (#31604) 
* Add Toggle Underline button to PDA.dm

-Adds Toggle Underline button to PDA menu that, when pressed, applies underline styling to all <a> elements.

* Changed 1/0 to bools

Now using TRUE and FALSE, also cleaned some HTML I missed the first time
 2017-10-13 16:51:44 -05:00