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

1965 Commits

Author SHA1 Message Date
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
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
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
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
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
ShizCalev
c7afe4f70e Cleans up explosives at syndie base ruin (#31645) 2017-10-13 16:29:36 -05:00
MoreRobustThanYou
fdffebb3b8 You can now drag-drop people into open DNA scanners (#31646) 2017-10-13 16:28:24 -05:00
francinum
f63adc1931 Fixes various Nanotrasen capitalizations (#31620) 
* Fixes capitalization of Nanotrasen for secsuits

gimme the GBP

* Fixes this one too
 2017-10-13 12:13:26 -05:00
LetterJay
ce743f7d42 Update world.dm 2017-10-13 10:30:18 -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
Jordan Brown
1941a8fcfa Merge pull request #31614 from AnturK/zap 
Fixes electrocution animation
 2017-10-13 09:14:45 -05:00
Jordan Brown
9d448fda76 Merge pull request #31602 from AnturK/tunnels 
Fixes diagonal tunnels
 2017-10-13 09:14:34 -05:00
LetterJay
da1eb3cd52 Merge branch 'master' into upstream-merge-31631 2017-10-13 08:31:13 -04:00
LetterJay
f488fa3ac3 Merge pull request #3356 from Citadel-Station-13/upstream-merge-31565 
[MIRROR] Stargazers are now station-restricted, and cogged APCs are now quiet
 2017-10-13 00:20:54 -04: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
LetterJay
31914b7723 Merge pull request #3341 from Citadel-Station-13/upstream-merge-31549 
[MIRROR] Fixes plastic explosive issues
 2017-10-13 00:04:47 -04:00
LetterJay
aaa76a47f5 Merge pull request #3333 from Citadel-Station-13/upstream-merge-31617 
[MIRROR] Fixes topic handlers
 2017-10-12 23:49:26 -04:00
Ashe Higgs
f9436e53c4 Stargazers are now station-restricted, and cogged APCs are now quiet (#31565) 
* Clockwork power generator tweaks

* Includes a blob_allowed check
 2017-10-12 18:32:37 -05:00
oranges
9663adaa3f Use legacy topic keywords lookup method 2017-10-12 16:06:02 -05:00
vuonojenmustaturska
12ef284e68 Fixes foam darts on cardboard cutouts and shooting range targets (#31579) 2017-10-12 15:46:05 -05:00