Commit Graph

6885 Commits

Author SHA1 Message Date
Poojawa
cb342866d6 a few last minute changes from TG
also changes His Grace from 25 to 10 requirments
2018-09-18 23:12:29 -05:00
Poojawa
7d300117af literally everything Bhjin has been complaining about
also modularizes stuff and adds more comments. Like responsible downstream repos should have.
2018-09-18 03:59:46 -05:00
Poojawa
bc0d14c193 Continual updates until merged 2018-09-17 04:55:03 -05:00
Poojawa
99e57fb221 various citadel tweaks/fixes
remeber to add //citadel edit to base code changes because we're still a downstream and hard syncs are still a thing
2018-09-17 03:26:05 -05:00
Poojawa
ca822954e4 Fixes Dogborg animations & huds
Also makes the silent check more sensible for prey loop. Re-adds borg repair balancing.
2018-09-16 16:09:53 -05:00
Poojawa
cad43a6421 Fixes Drake vore, sound Looping
Also help intent squirms work again anything else still escapes.
2018-09-16 14:13:51 -05:00
Poojawa
1a2460ed28 Continous update intergration until being merged
Also tgui fixes/updates
2018-09-15 00:37:29 -05:00
Poojawa
62813d4392 Fixes Preference related issues
Also fixes headpatting & tail checks in general
2018-09-14 03:06:21 -05:00
Poojawa
42db44b39e Alien Ruin fix, various cherrypicked upstream fixes
Also adds new buildmode
2018-09-13 22:55:11 -05:00
Poojawa
b00a76476c Oh hey, all of those compile fixes 2018-09-11 11:00:18 -05:00
Poojawa
834a94b97d some compile fixes 2018-09-11 09:23:20 -05:00
Poojawa
afac3ae0ab Merge branch 'master' into changelog-memes 2018-09-11 07:52:59 -05:00
Poojawa
284e9d0325 module things, jfc 2018-09-11 07:51:01 -05:00
Poojawa
dfcde0eb3c Merge remote-tracking branch 'refs/remotes/origin/master' into changelog-memes 2018-09-10 23:51:25 -05:00
deathride58
2b7af47717 Merge pull request #7557 from Trilbyspaceclone/patch-2
NPC Space Pirate Heath Buff 100 -> 115 (Yarr)
2018-09-10 18:56:34 -04:00
deathride58
d36e683db3 Merge pull request #7547 from Citadel-Station-13/kevinz000-patch-5
fixes admin buildmode being unable to erase the heat of fusion reactions
2018-09-10 18:53:58 -04:00
deathride58
997cb75f8f Merge pull request #7542 from Citadel-Station-13/kevinz000-patch-2
adds prescription nvgs
2018-09-10 18:51:05 -04:00
deathride58
bafac93084 Merge pull request #7538 from Trilbyspaceclone/patch-22
Makes a new blue space node, Bluespace Pockets!(Nerfing sci)
2018-09-10 18:50:45 -04:00
Trilbyspaceclone
988d5fd558 NPC Space Pirate Heath Buff 100 -> 115
For the away mission
2018-09-07 16:05:51 -04:00
deathride58
7650bac441 Upstream bugfix mirror spree (#7541)
* tgstation/tgstation#40061 - Fixes mobs getting stuck at min/max body temperature

* tgstation/tgstation#40043 - fixes beam rifles opening lockers

* tgstation/tgstation#40041 - Pictures of asses are properly sized now

* tgstation/tgstation#40084 - fixes lastattacker not including unarmed attacks

* tgstation/tgstation#39968 - Fixes plastic golems ventcrawling with items in pockets

* tgstation/tgstation#39885 - Fix overcharging energy guns crashing the server
2018-09-07 07:25:42 -07:00
deathride58
b34b53193f tgstation/tgstation#39287 - Makes rapid fire mobs more configurable (#7549) 2018-09-07 07:24:39 -07:00
deathride58
1bc8b3530c Adds spawn text when spawning in as a miner. (#7555)
* adds spawn text when spawning in as a miner

* fixes compiling error
2018-09-07 07:22:44 -07:00
deathride58
b604390f33 Ports tgstation/tgstation#39302 with adjustments, see desc of commit (#7424)
Instead of the box being 100% invisible at all times, the box will steadily become more and more visible as you move. The faster you move, the more visible the box becomes. The box will slowly become invisible again every process() cycle.
This also makes the box inherit the movement delay of it's user, meaning you're able to sprint while moving inside boxes, or walk to slow yourself down.
2018-09-07 05:40:53 -07:00
deathride58
6fa011c1be INTRODUCING KITCHEN GUN (#7508) 2018-09-07 05:40:35 -07:00
deathride58
55db128199 [EXPERIMENTAL] Let's give active turf processing it's own bloody subsystem. With blackjack! And hookers! (#7509)
* HOW ABOUT WE TAKE THE AIR PROCESSING

AND MOVE IT OVER THERE!!!!

* makes gas reactions happen in the original atmos subsystem so gas reactions run at the original atmos speed
2018-09-07 05:23:42 -07:00
deathride58
6cc7c3cd6b Merge pull request #7533 from Citadel-Station-13/fusion_2
Ports new fusion from /tg/station. Now with extra FUN*! *lethality, lightning, radioactive fallout, and explosions
2018-09-06 14:28:15 -04:00
deathride58
b5566353cf Merge pull request #7531 from nik707/fuckingdronesman
clarifies drone rules when becoming a drone
2018-09-06 13:33:36 -04:00
kevinz000
4f1e6603cc Update helpers.dm 2018-09-06 05:35:43 -07:00
Poojawa
235bbae157 ports BSQL to go along with tools
There, now you can shut up about it not being ported you meme
2018-09-05 23:45:53 -05:00
kevinz000
cfc3800469 Update helpers.dm 2018-09-05 20:03:26 -07:00
kevinz000
50c3a127f2 Update all_nodes.dm 2018-09-05 06:49:50 -07:00
kevinz000
dca6ea461b Update misc_designs.dm 2018-09-05 06:49:20 -07:00
kevinz000
f694924573 Update _glasses.dm 2018-09-05 06:47:23 -07:00
Trilbyspaceclone
9a97c3ebd7 Makes a new blue space node! 2018-09-04 22:27:54 -04:00
kevinz000
0e0928df26 Merge branch 'master' into fusion_2 2018-09-03 11:17:45 -07:00
deathride58
c8a3f56af6 Merge pull request #7489 from Citadel-Station-13/nanites
Nanites port
2018-09-03 13:47:28 -04:00
deathride58
d3c116d1a0 Merge pull request #7518 from Poojawa/cit_pref_issues
Fixes Cit_toggles by sanitizing it with less autism
2018-09-03 13:44:16 -04:00
kevinz000
f8a0ac8574 work damnit, work. 2018-09-03 10:43:49 -07:00
kevinz000
2bf5e6af58 Initial Commit 2018-09-03 10:35:47 -07:00
nik707
3f5b75e435 makes this less misleading 2018-09-02 18:04:13 -05:00
deathride58
fe7b4d888e Merge pull request #7511 from Poojawa/patch-1
Updates IC issue message
2018-09-01 06:11:12 -04:00
deathride58
60c7c2cda5 Merge pull request #7506 from Citadel-Station-13/kevinz000-patch-2
Clamps flash confusion
2018-09-01 06:09:32 -04:00
Poojawa
4be05e412e Fixes Fedoras having armor values (#7521) 2018-08-31 12:13:50 -07:00
Poojawa
1975c74efb Fixes Cit_toggles by sanitizing it with less autism
how the fuck did it never go from toggles -> cit_toggles I haven't a
clue
2018-08-31 03:11:41 -05:00
Poojawa
6344de3a14 Updates IC issue message 2018-08-28 22:50:34 -05:00
deathride58
4446251a6d nerfs nerve support because lets face it, it's just straight-up cancer 2018-08-28 08:11:09 -04:00
deathride58
69e1cb5aea nerfs disablers, buffs tasers (#7507) 2018-08-28 02:41:01 -07:00
kevinz000
0a39366f1a Update flash.dm 2018-08-27 17:57:05 -07:00
deathride58
778e45a1e9 Merge pull request #7494 from Citadel-Station-13/kevinz000-patch-6
makes cns rebooters useful again
2018-08-26 21:25:42 -04:00
deathride58
0f53432680 Merge pull request #7500 from Citadel-Station-13/kevinz000-patch-7
fixes techweb node default cost being an int instead of a list
2018-08-26 21:25:09 -04:00