shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,417 Commits 5 Branches 0 Tags
b31bfc0ca6e8fcfbf63ff50bd7e4d663b1594458
Commit Graph

8631 Commits

Author SHA1 Message Date
CitadelStationBot
8fb72176be Merge pull request #5384 from deathride58/iamgoingtoregretthis 
Makes input boxes for emotes larger.
 2018-02-09 07:46:28 -06:00
Nick
8ef7eea4fa Merge branch 'master' into bunnypack 2018-02-09 07:10:12 +01:00
deathride58
3fb0579762 Merge pull request #5379 from Citadel-Station-13/upstream-merge-35426 
[MIRROR] adds italian moustache that makes you italian
 2018-02-09 03:01:08 +00:00
deathride58
832ac9a64a makes emote input text boxes larger 2018-02-08 21:47:29 -05:00
deathride58
bf33dadc0b Merge pull request #5383 from Citadel-Station-13/upstream-merge-35428 
[MIRROR] Atom initialization counter only shows up in TESTING mode
 2018-02-09 01:30:03 +00:00
deathride58
2d488148c7 Update genetics.dm 2018-02-08 20:27:46 -05:00
Jordan Brown
5a3b322d43 Atom initialization counter only shows up in TESTING mode (#35428) 2018-02-08 16:12:53 -06:00
Jordan Brown
623513ab24 Merge pull request #35419 from kevinz000/patch-446 
fixes beam rifle zooming
 2018-02-08 15:18:40 -06:00
PKPenguin321
bdab8a71d9 adds italian moustache that makes you italian 2018-02-08 14:30:30 -06:00
Improvedname
464077ef3a bunni 2018-02-08 20:31:26 +01:00
deathride58
014aeb534c Merge pull request #5377 from Citadel-Station-13/upstream-merge-35423 
[MIRROR] Fixes geiger counters on engiborgs
 2018-02-08 18:57:04 +00:00
deathride58
329f70139c RESETS AGE_MIN TO 18 2018-02-08 13:56:38 -05:00
vuonojenmustaturska
56369b7f99 Fixes geiger counters on engiborgs (#35423) 
* a commit

* Update geiger_counter.dm
 2018-02-08 11:21:27 -06:00
deathride58
3762b9c474 Merge pull request #5376 from Citadel-Station-13/upstream-merge-35410 
[MIRROR] Fixes primary AI spawning at incorrect locations
 2018-02-08 16:26:33 +00:00
deathride58
4312966f77 Merge pull request #5375 from Citadel-Station-13/upstream-merge-35418 
[MIRROR] Allows projectiles to pass portals
 2018-02-08 16:26:14 +00:00
Jordan Brown
28fe3df885 Merge pull request #35410 from ShizCalev/ai-loc-fix 
Fixes primary AI spawning at incorrect locations
 2018-02-08 09:06:14 -06:00
Jordan Brown
6f60dd1591 Merge pull request #35418 from kevinz000/patch-445 
Allows projectiles to pass portals
 2018-02-08 09:05:02 -06:00
Jordan Brown
ee77e12bca Merge pull request #35412 from DaxDupont/flags-are-for-fags 
Brings certain designs in line with others.
 2018-02-08 09:04:46 -06:00
LetterJay
69f62c75db Merge pull request #5372 from Citadel-Station-13/upstream-merge-35447 
[MIRROR] Fix intendation on embedding datum initializer
 2018-02-08 07:13:11 -06:00
LetterJay
7a13591920 Merge pull request #5371 from Citadel-Station-13/upstream-merge-35388 
[MIRROR] Adds basic trailer support to vehicles
 2018-02-08 07:13:04 -06:00
LetterJay
f5666c115a Merge pull request #5370 from Citadel-Station-13/upstream-merge-35398 
[MIRROR] Removes an unnecessary type check from autolathe attackby
 2018-02-08 07:12:48 -06:00
LetterJay
e4319100b5 Merge pull request #5369 from Citadel-Station-13/upstream-merge-35275 
[MIRROR] SM can explode on space tiles again
 2018-02-08 07:12:32 -06:00
LetterJay
e3067e835a Merge pull request #5368 from Citadel-Station-13/upstream-merge-34834 
[MIRROR] Circuit drone + grabber/thrower balance changes
 2018-02-08 07:12:13 -06:00
LetterJay
e548295398 Merge pull request #5367 from Citadel-Station-13/upstream-merge-35346 
[MIRROR] Fixes cyborg related cuffing issues
 2018-02-08 07:11:52 -06:00
LetterJay
35103d74bd Merge pull request #5366 from Citadel-Station-13/upstream-merge-35296 
[MIRROR] Heart Disease 2: Electric Boogaloo
 2018-02-08 07:11:42 -06:00
LetterJay
bf84d1502b Merge pull request #5365 from Citadel-Station-13/upstream-merge-35399 
[MIRROR] [s]Closes exploits in proc calling admin datum procs.
 2018-02-08 07:10:55 -06:00
vuonojenmustaturska
79a4b9be58 Fix intendation on embedding datum initializer (#35447) 2018-02-08 04:59:18 -06:00
Iamgoofball
1cc72fb3d4 Adds basic trailer support to vehicles (#35388) 
* Adds basic trailer support to vehicles

* Move compat.
 2018-02-08 03:22:07 -06:00
oranges
39b6d1fb49 Merge pull request #35398 from ACCount12/pr_atomization 
Removes an unnecessary type check from autolathe attackby
 2018-02-08 03:19:50 -06:00
Dax Dupont
6dc78e0201 SM can explode on space tiles again (#35275) 
* Reordered some of the SM logic

* make it a little slower

* It does not explode instantly i tested
 2018-02-08 03:13:28 -06:00
Evsey Antonovich
c066120fc0 Circuit drone + grabber/thrower balance changes (#34834) 
* makes grabbers bulky and inventory max bulky

* makes circuit drones bulky

* removes drone stacking

* made grabbers max w class based on drone assembly, changed their w class back to small

* review stuff

* makes throwers max_w_class depend on assembly size

* uh

* kills sheer heart attack

* fuck off

* FUCK

* GR
 2018-02-08 03:11:12 -06:00
oranges
d427e0174b Merge pull request #35346 from DaxDupont/kinky-cuffs 
Fixes cyborg related cuffing issues
 2018-02-08 03:07:51 -06:00
MoreRobustThanYou
9c957f5a0b Heart Disease 2: Electric Boogaloo (#35296) 
* Heart Disease 2: Electric Boogaloo

* Upd8
 2018-02-08 03:02:29 -06:00
Kyle Spier-Swenson
06a1d39595 [s]Closes exploits in proc calling admin datum procs. (#35399) 
* Closes exploits in proc calling admin datum procs.

There is likely one in ranks, but that can be its own pr.

* Update holder2.dm
 2018-02-08 02:55:07 -06:00
oranges
76ec67f246 Merge pull request #35401 from MrStonedOne/patch-475 
[s]Closes exploits in proc calling admin rank datum procs.
 2018-02-08 02:54:55 -06:00
LetterJay
6043f3a852 Merge pull request #5363 from Citadel-Station-13/upstream-merge-35409 
[MIRROR] Belts now have inhand sprites
 2018-02-08 00:30:48 -06:00
LetterJay
c8b7e5dc7a Merge pull request #5362 from Michiyamenotehifunana/nekomimi-port 
Ports TG's nekomimi to Cit's mammal sprite accessories system
 2018-02-08 00:30:31 -06:00
Jordan Brown
bbf970c213 Merge pull request #35409 from epochayur/master 
Belts now have inhand sprites
 2018-02-07 23:48:17 -06:00
Michiyamenotehifunana
ca8a8e12bf Ports TG nekomimi to Cit's mammal sprite accessories system 2018-02-08 12:59:01 +08:00
MMMiracles
2d499b938c adds that farm your dad talked about sending your old pet catperson to so they could live out the rest of their lives free (#35168) 
* adds a space ruin for where dad tells you they sent your pet catperson to live on a farm where they can be free and chase all the grayshirts they want

* dirty vars

* Vars

* changes windoor to proper subtype, removed extra circular saw

* area/space to area/ruin/unpowered, added gps tag

* in area/space nobody can hear you scream

* Update mrow_thats_right.dmm

if i scream, scream, scream, about a good man's life, would you ever stop and listen, would you open up your eyes

* cat
 2018-02-07 20:23:32 -06:00
CitadelStationBot
717da969a6 [MIRROR] Var cleanup and map fixes (#5359) 
* Merge pull request #35429 from ShizCalev/snowdin-cleanup

Var cleanup and map fixes

* Var cleanup and map fixes
 2018-02-07 20:04:04 -06:00
deathride58
b1ea2773fd Merge pull request #5357 from Citadel-Station-13/upstream-merge-35383 
[MIRROR] Changes doppler array point formula
 2018-02-07 20:52:09 +00:00
deathride58
ae03e3daa4 Merge pull request #5348 from Citadel-Station-13/upstream-merge-35194 
[MIRROR] Adds anomalous, infinitely-regenerating pizza boxes as a very rare item from pizza crates
 2018-02-07 20:51:55 +00:00
deathride58
bfce0e4885 Merge pull request #5339 from Citadel-Station-13/upstream-merge-35352 
[MIRROR] Toy Daggers!
 2018-02-07 20:51:39 +00:00
deathride58
7295e9ba82 Update doppler_array.dm 2018-02-07 14:14:53 -05:00
deathride58
e2a6e36ae5 Merge branch 'master' into upstream-merge-35383 2018-02-07 19:13:41 +00:00
deathride58
0d7d8095bb Update doppler_array.dm 2018-02-07 14:13:13 -05:00
deathride58
b8f9807e39 Merge pull request #5358 from Citadel-Station-13/upstream-merge-35395 
[MIRROR] Fixes callbacks and invoke time args failing when pushUsr was used
 2018-02-07 19:12:35 +00:00
deathride58
a3f3e50f0a Merge pull request #5356 from Citadel-Station-13/upstream-merge-35386 
[MIRROR] balances the netherworld link, spawners can now spawn from a pool of mobs, and the netherworld link can now summon all three types of netherworld critters. (and mining spawner cleanup for admin events i guess)
 2018-02-07 19:12:13 +00:00
deathride58
6e469dcf88 Merge pull request #5355 from Citadel-Station-13/upstream-merge-35393 
[MIRROR] blueprint area changes are now logged to the game log
 2018-02-07 19:11:47 +00:00