Commit Graph

1751 Commits

Author SHA1 Message Date
deathride58
4ac2101d1a Merge pull request #5451 from deathride58/GIANTSYNCNUMBER2049623045
TG Sync #4985279348672983476
2018-02-14 04:11:44 +00:00
deathride58
aa3ee6b6e2 Merge pull request #5475 from Citadel-Station-13/upstream-merge-35605
[MIRROR] Fixes ai transform being picky
2018-02-14 03:34:13 +00:00
Jordan Brown
807a2ebaeb Merge pull request #35605 from MrStonedOne/patch-481
Fixes ai transform being picky
2018-02-13 21:00:05 -06:00
Jordan Brown
da5cc6a8cc Merge pull request #35618 from YPOQ/processdeaddiseasefix
Fixes process_dead diseases not processing at all
2018-02-13 20:58:48 -06:00
ShizCalev
833a700cbb Fixes invalid throwat args (#35565) 2018-02-13 07:14:47 -06:00
deathride58
72ff7be9bd code folder. 221 files changed wew 2018-02-12 21:03:40 -05:00
Robustin
1825c944b6 Cult Update? Cult Update! (#35433)
* Cult Fixes and Tweaks

* Master prompt and spelling fix

* Couple small fixes
2018-02-12 15:18:21 -06:00
Jordan Brown
e2b4e3c567 Fixes wrong ID for syndicate ghost roles 2018-02-11 15:35:14 -06:00
ShizCalev
f4685cfe01 [s] Fixes altclick exploits 2018-02-11 05:08:00 -06:00
deathride58
a34dc0b90b Update personality.dm 2018-02-10 19:51:21 -05:00
Jordan Brown
fd479e7128 Replaces some var values with defines 2018-02-10 11:11:09 -06:00
deathride58
832ac9a64a makes emote input text boxes larger 2018-02-08 21:47:29 -05:00
vuonojenmustaturska
56369b7f99 Fixes geiger counters on engiborgs (#35423)
* a commit

* Update geiger_counter.dm
2018-02-08 11:21:27 -06: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
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
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
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
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
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
9c1effc0ff Merge pull request #5353 from Citadel-Station-13/upstream-merge-35258
[MIRROR] Explosive holoparasites must now be adjacent to turn objects into bombs
2018-02-07 19:11:14 +00:00
deathride58
e7fa382cd4 Merge pull request #5349 from Citadel-Station-13/upstream-merge-35374
[MIRROR] Fix pressure damage not taking effect properly
2018-02-07 19:09:52 +00:00
deathride58
41bacce125 Merge pull request #5346 from Citadel-Station-13/upstream-merge-35356
[MIRROR] Makes the posibrain play a ping sound on success.
2018-02-07 19:08:09 +00:00
deathride58
2732823a68 Merge pull request #5342 from Citadel-Station-13/upstream-merge-35277
[MIRROR] Forces gases to obey certain laws of nature
2018-02-07 19:07:01 +00:00
Armhulen
ae5fa73809 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) (#35386)
* woah totally wacky wazoo

* OH I'M SAYIN IT

* donezo now lets do the rest lol

* commiting this so i can revert back to it when nobody likes my changes past this point

* 🙏

* jesus

* christ

* move'd
2018-02-07 08:13:45 -06:00
vuonojenmustaturska
b678bcf8eb Merge pull request #35258 from kevinz000/patch-441
Explosive holoparasites must now be adjacent to turn objects into bombs
2018-02-07 05:40:34 -06:00
vuonojenmustaturska
9bb3ce1931 Merge pull request #35374 from AutomaticFrenzy/patch/pressure
Fix pressure damage not taking effect properly
2018-02-07 04:56:44 -06:00
vuonojenmustaturska
23843241b4 Merge pull request #35356 from DaxDupont/chime
Makes the posibrain play a ping sound on success.
2018-02-07 04:41:52 -06:00
BordListian
9b910552fd Forces gases to obey certain laws of nature (#35277)
* - Fixes most gas reactions deleting more gas than exists and thus making gas out of nowhere.
- Makes Noblium formation no longer multiplicative.
- Expunges invocation of a byond bug by stimulum production.

* - Redundant parenthesis
- I'm going back to sleep

* - Sends fire and fusion to jail

* - Deletes redundant line in lung code
- Adds garbage_collect and clamp to cryocells
- Adds clamp to collectors

* - Reverted the tritium burn changes because apparently I'm dumb

* - FUCK

* - Fixes division by zero when fusion has no impurities

* - Adds extra commentary for the next unlucky sod
- Compresses lines for performance or so they say
- Adds ..() to rad_act on turfs

* - Fuck it, fixes rad collectors, open turfs, geiger counters and living mobs not signalling rad_act components
2018-02-07 02:32:31 -06:00
Slignerd
afcdb771b3 Squashes silicon HUDs together (#35212)
* Squashes silicon sensors together

* Fixes proc names

* Brings back individual sec/med huds for pai usage

* This fixes the pai

* Fixes toggle text
2018-02-07 02:32:14 -06:00
CitadelStationBot
7126b61205 [MIRROR] Return of ore stacking, various changes to lavaland bombs to facilitate reduced lag (#5327)
* Return of ore stacking, various changes to lavaland bombs to facilitate reduced lag

* really? Like, a dozen fucking map conflicts. this map was fucked entirely
2018-02-06 19:06:31 -06:00
MMMiracles
4c6bdf1a9e Snowdin 2.0 2018-02-05 09:10:40 -06:00
CitadelStationBot
c4107ba117 [MIRROR] Fixes Luminous Slime spam (#5286)
* Fixes Luminous Slime spam

* Update jellypeople.dm
2018-02-05 04:56:39 -06:00
CitadelStationBot
98d18ee7e3 [MIRROR] Removes tripai landmark (#5280)
* Removes tripai landmark

* Update landmarks.dm
2018-02-05 04:44:31 -06:00
CitadelStationBot
9e229691cc Fixes clockwork sigil candidate runtime, cleans up some jobban checks with defines (#5304) 2018-02-05 04:23:09 -06:00
CitadelStationBot
417cd16239 [MIRROR] Fixes white "eye" pixels appearing on races with custom eyes on their sprite (#5255)
* Merge pull request #35185 from Xhuis/eyesontheinsideofourbrains

Fixes white "eye" pixels appearing on races with custom eyes on their sprite

* Fixes white "eye" pixels appearing on races with custom eyes on their sprite
2018-02-05 00:57:18 -06:00
CitadelStationBot
fb03783346 [MIRROR] Fixes changelings retaining fake brains on de-changelining (#5248)
* Merge pull request #34872 from AnturK/theresabraininymyhead

Fixes changelings retaining fake brains on de-changelining

* Fixes changelings retaining fake brains on de-changelining
2018-02-05 00:56:51 -06:00
CitadelStationBot
b25bcbbfab [MIRROR] Fixes power cell name and makes borgs use a standard high capacity cell. (#5315)
* Fixes power cell name and makes borgs use a standard high capacity cell. (#35265)

* Fixes name for upgraded power cell

* Harmonizes battery for cyborgs

* Remove duplicate battery code

* Fixes power cell name and makes borgs use a standard high capacity cell.
2018-02-05 00:47:39 -06:00
CitadelStationBot
7b7674d0ef [MIRROR] Fixes ancient goliathes tentacle attack continuing after death (#5285)
* Fixes ancient goliathes tentacle attack (#35243)

* Fixes ancient goliathes tentacle attack continuing after death
2018-02-04 23:18:51 -06:00
CitadelStationBot
23085154ab [MIRROR] Fixes animal spawners spawning mobs after death (#5284)
* Fixes ancient goliathes (#35242)

* Fixes animal spawners spawning mobs after death
2018-02-04 23:18:34 -06:00
CitadelStationBot
e2ce020a62 [MIRROR] Fixes a couple of typos and ports one New to Initialize (#5233)
* Merge pull request #35145 from vuonojenmustaturska/acidtypos

Fixes a couple of typos and ports one New to Initialize

* Fixes a couple of typos and ports one New to Initialize
2018-02-04 22:11:07 -06:00
Poojawa
7294424397 Makes Stargazers admin only 2018-02-03 09:03:16 -06:00
Poojawa
059b34050b Removes Stargazers, far too liable to be abused by powergamers 2018-02-03 06:24:27 -06:00
Poojawa
ae888f1dff fix problems with one weird trick
if I'm not using something, I shouldn't be using it.
2018-02-01 08:56:01 -06:00
Poojawa
ab0e0667f2 Makes Travis happy 2018-01-31 18:11:19 -06:00
Poojawa
2f16174e7c overdue refractor on layering code
also probably fixes missing sprites
2018-01-31 10:13:17 -06:00
Poojawa
a7f0ffb6f0 modules 2018-01-31 06:56:28 -06:00
Poojawa
a24788842b dogborg tweaks, so fuggin DUMB (#5202)
* apparantly you need shuttles, who knew

* some tweaks

Sprites need adjustments
Janidogs need adjustments in UI

* Hm, maybe a fix. Revert attempt to rename sprites

* [MIRROR] Better Chat Squashing (#5193)

* Merge pull request #35058 from uraniummeltdown/chatsquash

Better Chat Squashing

* Better Chat Squashing

* [MIRROR] Sexy Solar Sprites (#5191)

* replaced solar panel sprites with better ones

* Sexy Solar Sprites

* Automatic changelog generation for PR #5191 [ci skip]

* [MIRROR] New Coffin Sprite (#5190)

* coffins have a new sprite (#34995)

* New Coffin Sprite

* Automatic changelog generation for PR #5190 [ci skip]

* [MIRROR] Makes fire colorful and anime (#5187)

* Makes fire colorful and anime (#34977)

* - Makes fire colorful and anime

* - Updates light color on fires
- Makes fire update color less often (1/7th as often)

* - Changes the transition from blue to purple to be much more gradual, it starts at 40000 and peaks at 120000 Kelvin now
- Changes fusion fire (>4 million Kelvin) to have a slight colorshift to it (It's just the druggy overlay).

* - Moves fire above gas (and everything else)
- Changes fire alpha for low temperature fires to compensate for items no longer rendering on top of fire

* - Makes the new fire layer a define and makes sure it isn't above "Hyperspace Ripples" whatever that is

* - Removes comment

* - FIRE_LAYER is already defined for burning humans.

* Makes fire colorful and anime

* Automatic changelog generation for PR #5187 [ci skip]

* [MIRROR] Expand Cyborg (#5183)

* Expand Cyborg (#34958)

* Expand Cyborg

* i ded pls nerf

* Oh sheet

* Expand Cyborg

* Automatic changelog generation for PR #5183 [ci skip]

* [MIRROR] Cosmic Bedsheet (#5170)

* adds cosmic space bedsheet

* Cosmic Bedsheet

* [MIRROR] The punisher no longer punishes ticker subsystems with delayed fires (#5174)

* Merge pull request #34964 from MrStonedOne/patch-463

The punisher no longer punishes ticker subsystems with delayed fires

* The punisher no longer punishes ticker subsystems with delayed fires

* Fuck this I'm done with it
2018-01-30 15:17:46 -06:00
Poojawa
03086dfa91 Tg 1 28 sync testing/confirmation (#5178)
* maps, tgui, tools

* defines and helpers

* onclick and controllers

* datums

fucking caught that hulk reversal too.

* game and shuttle modular

* module/admin

* oh god they fucking moved antag shit again

* haaaaate. Haaaaaaaaaate.

* enables moff wings

* more modules things

* tgstation.dme

before I forget something important

* some mob stuff

* s'more mob/living stuff

* some carbon stuff

* ayy lmaos and kitchen meat

* Human stuff

* species things

moff wings have a 'none' version too

* the rest of the module stuff.

* some strings

* misc

* mob icons

* some other icons.

* It compiles FUCK BORERS

FUCK BORERS
2018-01-29 04:42:29 -06:00