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

5078 Commits

Author SHA1 Message Date
LetterJay
666ef5f60d Merge pull request #3401 from Citadel-Station-13/upstream-merge-31652 
[MIRROR] Golden Bike Horns now have a small delay between each flips.
 2017-10-15 10:22:52 -04:00
LetterJay
1a79e09cf8 Merge pull request #3400 from Citadel-Station-13/upstream-merge-31663 
[MIRROR] Repopulates SSshuttle recover
 2017-10-15 10:22:17 -04:00
LetterJay
499254761c Merge pull request #3399 from Citadel-Station-13/upstream-merge-31671 
[MIRROR] ID ejecting from computers by alt-clicking
 2017-10-15 10:22:04 -04:00
LetterJay
8f97e8c65f Merge pull request #3398 from Citadel-Station-13/upstream-merge-31688 
[MIRROR] fixes filter NaN issue
 2017-10-15 10:21:46 -04:00
LetterJay
6bcec20501 Merge pull request #3396 from Citadel-Station-13/upstream-merge-31679 
[MIRROR] Adds petcollars to the cmo, captain, and bartender's locker
 2017-10-15 10:21:11 -04:00
LetterJay
b02e9c6a90 Merge pull request #3395 from Citadel-Station-13/upstream-merge-31731 
[MIRROR] [s] Fixes camera mobs becoming contaminated and other tweaks
 2017-10-15 10:20:04 -04:00
LetterJay
5b4bb85ca1 Merge pull request #3394 from Citadel-Station-13/upstream-merge-31726 
[MIRROR] restores safety check in gas mixture temperature_share()
 2017-10-15 10:19:33 -04:00
LetterJay
243d8759c7 Update gas_mixture.dm 2017-10-15 07:51:48 -05:00
LetterJay
a5ee5c76c8 Merge pull request #3393 from Citadel-Station-13/upstream-merge-31684 
[MIRROR] [s] Removes scrubber and filter infinite pressure exploits.
 2017-10-15 08:48:56 -04:00
LetterJay
e2914c5987 Merge pull request #3392 from Citadel-Station-13/upstream-merge-31677 
[MIRROR] Allows mobs to get shocked when they smash things
 2017-10-15 08:48:26 -04:00
LetterJay
2f88a62b26 Merge pull request #3391 from Citadel-Station-13/upstream-merge-31674 
[MIRROR] Resets client movement delay to its initial value on death
 2017-10-15 08:48:17 -04:00
LetterJay
58872d8b02 Merge pull request #3390 from Citadel-Station-13/upstream-merge-31616 
[MIRROR] readds guardians to the uplink
 2017-10-15 08:48:04 -04:00
LetterJay
f68230c93c Update job_closets.dm 2017-10-15 06:58:52 -05:00
Mercenaryblue
ecd85a2de7 Golden Bike Horns now have a small delay between each flips. (#31652) 
* flip timer on GBH

Added a slight timer on the flip effect, allowing its victims to finish the flip before being forced to jump again.

* GBH Fix 1.0.1

if (!flip_flag)

* world.time instead of a timer
 2017-10-14 18:51:36 -05:00
Jordan Brown
44ca2d67f6 Merge pull request #31663 from ninjanomnom/shuttle-subsystem 
Repopulates SSshuttle recover
 2017-10-14 18:49:24 -05:00
Jordan Brown
5bb7618aa9 Merge pull request #31671 from kingofkosmos/altclickejectidfromcomputers 
ID ejecting from computers by alt-clicking
 2017-10-14 18:48:13 -05:00
Jordan Brown
6b7fce369b Merge pull request #31688 from duncathan/atmos-patch3 
fixes filter NaN issue
 2017-10-14 18:46:01 -05:00
jughu
4b17b4a9a3 Adds petcollars to the cmo, captain, and bartender's locker 2017-10-14 18:01:05 -05:00
Emmett Gaines
24b9d4b9f4 Fixes camera mobs becoming contaminated and other tweaks (#31731) 2017-10-14 17:40:34 -05:00
duncathan salt
b840605cb6 restores safety check in gas mixture temperature_share() (#31726) 2017-10-14 15:53:33 -05:00
kevinz000
80ac0313a7 Merge pull request #3389 2017-10-14 13:36:22 -07:00
kevinz000
e8bb77ba2c Merge pull request #3387 2017-10-14 13:35:04 -07:00
duncathan salt
9a4ee4d5a4 removes filter and scrubber pressure exploits (#31684) 2017-10-14 15:20:49 -05: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
vuonojenmustaturska
1831bc8ea9 Allows mobs to get shocked when they smash things (#31677) 
also fixes an unrelated runtime involving magillitis
 2017-10-14 15:19:37 -05:00
vuonojenmustaturska
4c697df2e9 Resets client movement delay to its initial value on death (#31674) 2017-10-14 15:19:28 -05:00
Armhulen
c518497e80 readds guardians to the uplink (#31616) 
* LOL! LMAO! ROFLMAO!

* 12 + 18 = ??

* gang in [current_year]

* ok!
 2017-10-14 15:19:19 -05:00
vuonojenmustaturska
f2413f047f Allows simple animals to qdel, generally (#31680) 
* Allows simple animals to qdel, generally

* requested changes
 2017-10-14 15:18:07 -05: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