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

965 Commits

Author SHA1 Message Date
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
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
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
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
LetterJay
6e10c020ec Update syndieminibomb.dm 2017-10-13 10:26:07 -05:00
nicbn
921b65ced0 Bullet decals tweak (#31420) 
* wee

* screen clock update

* resist and stop pulling

* Whoop, Joan messed up on the selection border so here's some fixed icons for that

* there we go

* Update walls.dm

* Update walls.dm

* Update walls.dm
 2017-10-13 09:47:10 -05:00
Jordan Brown
bd7a0d65b5 Fix many instances of "the the" 2017-10-13 09:41:54 -05:00
Emmett Gaines
55e8f6526c Radiation rework and subsystem 2017-10-13 09:22:23 -05:00
kevinz000
40a1ceed26 Fixes explosion particles causing a massive amount of runtimes (#31608) 2017-10-13 09:15:53 -05:00
LetterJay
116f06f428 Merge pull request #3348 from Citadel-Station-13/upstream-merge-31579 
[MIRROR] Fixes foam darts on cardboard cutouts and shooting range targets
 2017-10-13 00:07:14 -04:00
vuonojenmustaturska
12ef284e68 Fixes foam darts on cardboard cutouts and shooting range targets (#31579) 2017-10-12 15:46:05 -05:00
ShizCalev
4fe003af83 Fixes plastic explosive issues (#31549) 2017-10-12 12:38:08 -05:00
duncathan salt
c0e9cde5c2 Minor refactor of how gas IDs are handled 2017-10-12 00:30:09 -05:00
LetterJay
3f6596dc17 Merge pull request #3300 from Citadel-Station-13/upstream-merge-31406 
[MIRROR] Adds Slappers
 2017-10-10 22:34:28 -04:00
LetterJay
6e155be9fe Merge pull request #3298 from Citadel-Station-13/upstream-merge-31474 
[MIRROR] Removes some spawns from explosion effects
 2017-10-10 22:34:12 -04:00
LetterJay
822f15f4ae Merge pull request #3292 from Citadel-Station-13/upstream-merge-31494 
[MIRROR] In which the stoner one gets stoned and tries to address tick contention... again
 2017-10-10 22:32:52 -04:00
LetterJay
41ef0500ac Merge pull request #3289 from Citadel-Station-13/upstream-merge-31444 
[MIRROR] Fixes cigarettes runtiming when preferences generation attempts to light them before initialization is done.
 2017-10-10 22:32:02 -04:00
deathride58
c163176e5d Adds Slappers (#31406) 
* ADDS SLAPPERS

* fixes everything, just need sprites

* nerfs criticism
 2017-10-10 19:54:30 -05:00
MoreRobustThanYou
3e8d51d871 Removes some spawns from explosion effects (#31474) 
* Update effects_explosion.dm

* god damn it

* Update effects_explosion.dm

* Update effects_explosion.dm

* THANK YOU KEVINZ FOR THE WRAPPER

* Update effects_explosion.dm

* Update effects_explosion.dm

* clean my ass
 2017-10-10 15:41:24 -05:00
Jordan Brown
7b30be0058 Merge pull request #31494 from MrStonedOne/tick_contention_tug_of_war 
In which the stoner one gets stoned and tries to address tick contention... again
 2017-10-10 13:28:38 -05:00
kevinz000
3d4b35d000 Fixes cigarettes runtiming when preferences generation attempts to light them before initialization is done. (#31444) 
* Update cigs_lighters.dm

* Update cigs_lighters.dm

* Update cigs_lighters.dm
 2017-10-10 13:19:03 -05:00
Robustin
a570ec8610 Adds the Chemistry Smoke Machine (#30920) 
* Smoke Machine

* Tweak

* More responsive smoke timing

* Antur Review and Admin Logs

* Cboss review

* More logging

* Removes analyze, streamlines logs

* r-e-a

* no s in reagents_list

* Cyberboss Review

* woops

* Cboss nitpicking
 2017-10-10 13:13:38 -05:00
LetterJay
f0fc11f5b5 Merge pull request #3273 from Citadel-Station-13/upstream-merge-31493 
[MIRROR] Fixes closet layer
 2017-10-10 05:55:28 -04:00
AnturK
344238a401 Fixes closet layer (#31493) 
* Fixes closet layer

* Actually this might be better.
 2017-10-10 03:20:53 -05:00
Tad Hardesty
01ecdff51a Improve extended examination text for many objects (#31381) 
Plurality, capitalization, punctuation, and item icons have been
improved. Status displays now show the same text on examination that
they do visually. Inducers only show a success message when they
actually succeed.
 2017-10-10 03:07:38 -05:00
LetterJay
295c509236 Merge pull request #3264 from Kevak/Shockcollarpocketfix 
Fixes Shock Collars Getting Stuck In Pockets.
 2017-10-10 02:46:45 -04:00
LetterJay
e0f9167153 Merge pull request #3248 from Citadel-Station-13/upstream-merge-31066 
[MIRROR] Refactors virus spreading
 2017-10-10 02:46:04 -04:00
Kevak
fb60efeacb Fixes shock collars getting stuck in pockets. 2017-10-09 22:45:02 -07:00
LetterJay
95031ae187 Merge pull request #3252 from Citadel-Station-13/upstream-merge-31441 
[MIRROR] Fixes a forceMove(null)
 2017-10-09 23:01:51 -04:00
kevinz000
2456a2a289 Update plastic.dm (#31441) 2017-10-09 14:26:40 -05:00
vuonojenmustaturska
176642ba76 Stops airlocks from getting harddeleted, also fixes an unrelated runtime (#31412) 
* Stops airlocks from getting harddeleted, also fixes an unrelated runtime

Destroying doors with a sniper rifle or anything that flat out destroys them good would runtime in doors.dm #L184.
Also doors would very often not get qdel'd properly, it was not 100% of the time but very common, this *seems* to fix it but since reproducing the bug was never quite certain, I'm not absolutely sure I got it. I did destroy all the doors on the station without triggering a harddel on a door after this fix, where previously it would happen.

* old friend ex_act
 2017-10-09 08:56:16 -05:00
XDTM
7a0ce217db Refactors virus spreading 2017-10-09 08:55:57 -05:00
LetterJay
86edafb132 lol 2017-10-09 01:06:50 -05:00
LetterJay
f6bfbaa192 Merge pull request #3226 from Citadel-Station-13/upstream-merge-31324 
[MIRROR] Minor refactor to storage items
 2017-10-08 16:22:40 -04:00
LetterJay
9cf77a79ba Merge pull request #3221 from Citadel-Station-13/upstream-merge-31262 
[MIRROR] TTV code cleanup
 2017-10-08 16:20:49 -04:00
LetterJay
d84ed9e9ae Merge pull request #3217 from Citadel-Station-13/upstream-merge-31393 
[MIRROR] Fixes wrapper being invisible
 2017-10-08 16:19:55 -04:00
LetterJay
fe2e29f0f8 Merge pull request #3210 from Citadel-Station-13/upstream-merge-31388 
[MIRROR] Moves assert_gas() into a define it should always have been, speeding up atmos slightly
 2017-10-08 16:19:12 -04:00