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

1996 Commits

Author SHA1 Message Date
LetterJay
638290e121 Merge pull request #3433 from Citadel-Station-13/upstream-merge-31765 
[MIRROR] Fixed fancy boxes not showing proper content amount.
 2017-10-16 10:40:06 -04:00
LetterJay
568ed91f28 Merge pull request #3430 from Citadel-Station-13/upstream-merge-30599 
[MIRROR] Moves projectile processing to a subsystem
 2017-10-16 10:39:41 -04:00
Jordan Brown
98fb887ccc Merge pull request #31765 from DaxDupont/fancythis 
Fixed fancy boxes not showing proper content amount.
 2017-10-16 07:15:04 -05:00
LetterJay
4b6ebe3fa3 Merge pull request #3428 from Citadel-Station-13/upstream-merge-31710 
[MIRROR] Removes mapping error bandaid
 2017-10-16 07:29:20 -04:00
LetterJay
e4d2609800 Merge pull request #3420 from Citadel-Station-13/upstream-merge-31665 
[MIRROR] Adds logging crew manifest to seperate file
 2017-10-16 07:28:03 -04:00
LetterJay
399d84500c Merge pull request #3419 from Citadel-Station-13/upstream-merge-31139 
[MIRROR] Honkbots: The Clown's lil helpers.
 2017-10-16 07:27:15 -04:00
LetterJay
ec41bbc420 Merge pull request #3422 from Citadel-Station-13/upstream-merge-31733 
[MIRROR] closed turfs remove themselves from SSair.high_pressure_delta on change
 2017-10-16 07:25:44 -04:00
LetterJay
a11a474a94 Merge pull request #3416 from Citadel-Station-13/upstream-merge-31698 
[MIRROR] Prevents tiles from being placed on top of buckled mobs
 2017-10-16 07:09:30 -04:00
LetterJay
a703a599fa Merge pull request #3413 from Citadel-Station-13/upstream-merge-31695 
[MIRROR] Makes directional windows only block air if anchored
 2017-10-16 07:08:11 -04:00
LetterJay
d5d0fa919a Merge pull request #3411 from Citadel-Station-13/upstream-merge-31714 
[MIRROR] Fixes "permenant" and "permenantly" typos in code/comments.
 2017-10-16 07:06:37 -04:00
LetterJay
029d98028a Merge pull request #3410 from Citadel-Station-13/upstream-merge-31713 
[MIRROR] Fixes a bunch of runtimes involving supermatter suicides, also some initialize fixes
 2017-10-16 07:06:28 -04:00
kevinz000
ed96224d3a Moves projectile processing to a subsystem 2017-10-15 21:51:24 -05:00
Jordan Brown
baf8b578f5 Removes mapping error bandaid (#31710) 
* Removes mapping error bandaid

* Update conversion code
 2017-10-15 21:02:02 -05:00
duncathan salt
3da718d3b1 closed turfs remove themselves from SSair.high_pressure_delta on change (#31733) 2017-10-15 19:32:20 -05:00
AnturK
64b1be05ff Adds logging crew manifest to seperate file (#31665) 
* Adds logging crew manifest to seperate file

* Coding blind

* i can spel words

* Not everyone in the lobby please.

* Proper header

* Fix

* Better format
 2017-10-15 16:56:48 -05:00
Mercenaryblue
3690fc56c2 Honkbots: The Clown's lil helpers. (#31139) 
* Honkbots 0.9.0

Old code, needs testing.

* Honkbots 0.9.1

Small Fixes - Part 1

* Honkbot 0.9.1b

Fixes

* Honkbots 0.9.2

Added sound cooldown, fixes.

* Honkbots 0.9.5

Clown Box & Honkbot Assembly Code

* 0.9.5.a

oops

* Honkbots 1.0.0

Final touches and fixes.
Clown Box finished.
Assembly functioning.
Honkbots tested and ready to go.
Its time.

* Honkbots 1.0.1

Initialize and . = ..()

* Honkbots 1.0.2

Fixes and Changes
====
Nerfed Brute/Thermal Resist
Buffed Health (to avoid 1-shot)
Added HONK_BOT define

* Honkbots 1.0.3

Removed the cardboard assembly from death gibs.
Admin Bwoink removed from emagged soundtrack.
Honkbot now release an evil laugh when emagged.
Fixed strange behaviors on emagged level 1
Added a check against stamping multiple cardboard sheets.
Stamping a Clown Box now plays the bike horn, once.
Clown Boxes no longer get automatically placed in hands.
Various other fixes.

* Honkbots 1.0.3a

* Honkbots 1.0.3.b

Fixes.

* Honkbots 1.0.4

*Added an emote ping upon assembly creation.
*Enabled either Theatre or Robotics for access. ((fixing needing both))
*Honkbots are now more forgiving after being hit.
**Airhorn stun_attack now deals slight ear damage, for about 5 seconds.
**Cardboard no longer drops upon death. Robot arms have 50% chance.
**Using a new get_sfx() list when emagged.
**Optimization and other minor fixes.

* Honkbots 1.0.4.a

Missed it.

* Honkbots 1.0.4.b

use(1) and (client)

* Honkbots 1.0.4.c

Moved proc

* Honkbots 1.0.5

*Code Optimization
*Renaming w/ Pen (how could I even forget this)
*Assembly Defines

I'm afraid I'm simply out of my depth with the suggested use(1) rework.

* Honkbots 1.0.5.c

Reworked cardboard stamping.

It now works in the hands and on the ground, either solo or in stacks, and prevent itself being used in backpacks.

* Honkbots 1.0.5.d

Final

* Honkbots 1.0.5.e

comment

* 1.0.5.f

Optimization

* Honkbots 1.0.5.g

Missed requested stuff

* Honkbots 1.0.6

Requested changes.

* Honkbots 1.0.6a

Oops.

* Honkbots 1.0.6.c

Bugfix - Prevent building in backpacks.
Make sure they spawn on turf.

* Honkbots 1.0.7

one less spawn(0)
flag optimization
else return ..()

* Honkbots 1.0.7.a

Get rids of a lot of client checks at the cost of automatic AI retoration.

* Honkbots 1.0.7.b

Added judgment_criteria()
changed assess_threat to use judgment

* Honkbots 1.0.7.c

final = NONE
 2017-10-15 16:44:23 -05:00
Leo
0380e43f33 Merge pull request #31698 from duncathan/atmos-patch7 
Prevents tiles from being placed on top of buckled mobs
 2017-10-15 14:02:02 -05:00
Jordan Brown
e6def19aa2 Merge pull request #31695 from ninjanomnom/directional-windows 
Makes directional windows only block air if anchored
 2017-10-15 11:33:33 -05:00
Jordan Brown
3d50fec086 Merge pull request #31714 from DaxDupont/screaminginternally 
Fixes "permenant" and "permenantly" typos in code/comments.
 2017-10-15 11:32:13 -05:00
Jordan Brown
4e4f2fa19d Merge pull request #31713 from vuonojenmustaturska/initializefixesoct 
Fixes a bunch of runtimes involving supermatter suicides, also some initialize fixes
 2017-10-15 11:32:05 -05:00
WJohn
4b3f578633 Readds the boxstation whiteship as a ruin. (#31709) 
* Adds box's whiteship back as a broken down relic.

* And accompanying files to make it work.

* Derp
 2017-10-15 11:31:48 -05:00
LetterJay
b6f69c88ea Merge pull request #3402 from Citadel-Station-13/upstream-merge-31553 
[MIRROR] Removes a bunch of sleeps/spawns and makes a few booleans defines
 2017-10-15 10:22:59 -04:00
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
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
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
f4753de219 Update gland.dm 2017-10-15 07:00:28 -05:00
LetterJay
f68230c93c Update job_closets.dm 2017-10-15 06:58:52 -05:00
kevinz000
b20e5916ea Removes a bunch of sleeps/spawns and makes a few booleans defines 2017-10-14 18:53:48 -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
5bb7618aa9 Merge pull request #31671 from kingofkosmos/altclickejectidfromcomputers 
ID ejecting from computers by alt-clicking
 2017-10-14 18:48:13 -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
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
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
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
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
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
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
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
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
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