Commit Graph

135 Commits

Author SHA1 Message Date
LetterJay
5e0fd179bb Merge pull request #477 from Citadel-Station-13/upstream-merge-26285
[MIRROR] Cult stuff now initializes
2017-04-19 18:29:35 -05:00
CitadelStationBot
73d4469db5 Cult stuff now initializes 2017-04-19 04:40:07 -05:00
CitadelStationBot
80ec92c9bd Gives wirecutters origin tech 2017-04-19 04:32:43 -05:00
LetterJay
97016b0872 Merge pull request #460 from Citadel-Station-13/upstream-merge-26323
[MIRROR] Speeds up lighting initialization
2017-04-18 20:23:41 -05:00
LetterJay
405b71335e Merge pull request #459 from Citadel-Station-13/upstream-merge-26322
[MIRROR] Normalizes how some lighting things GC
2017-04-18 20:21:42 -05:00
CitadelStationBot
d19efeba8b Speeds up lighting initialization 2017-04-18 18:02:23 -05:00
CitadelStationBot
53ac3bcb82 Normalizes how some lighting things GC 2017-04-18 18:02:20 -05:00
CitadelStationBot
3f6d0f2647 Fixes proximity monitor runtimes 2017-04-18 11:07:54 -05:00
LetterJay
6e54eb217c Merge pull request #433 from Citadel-Station-13/upstream-merge-26276
[MIRROR] Removes rogue GLOB from message
2017-04-18 01:12:11 -05:00
LetterJay
723da20d18 Merge pull request #432 from Citadel-Station-13/upstream-merge-26275
[MIRROR] Cultists can no longer delay the shuttle after Nar'sie is summoned
2017-04-18 01:12:02 -05:00
CitadelStationBot
bfcae4eb99 Removes rogue GLOB from message 2017-04-17 09:45:38 -05:00
CitadelStationBot
19647e1c61 Cultists can no longer delay the shuttle after Nar'sie is summoned 2017-04-17 09:45:34 -05:00
CitadelStationBot
dd76874f1c Moves tesla_ignore from var on /mob/living to secondary flag 2017-04-17 09:45:30 -05:00
CitadelStationBot
6591075c5e Clockwork stuff uses Initialize (#426) 2017-04-16 18:15:48 -04:00
CitadelStationBot
64068fc614 Proximity sensing refactor (#425) 2017-04-16 18:15:29 -04:00
CitadelStationBot
dfd470adf9 Adds an xenobiology access shield wall generator to all maps' except Cerestation's xenobiology (#424) 2017-04-16 18:14:19 -04:00
CitadelStationBot
b61ac211a4 Fixes Orion Trail (#417) 2017-04-16 11:41:06 -04:00
TalkingCactus
abd7f2b348 Cleans Up Rejected Mirror files (#414)
* bang

* updates tgstation.dme

* fixes missing stylesheet entries

* updates the map

includes backup map file

* removes ten billion runtimes
2017-04-15 17:55:53 -04:00
CitadelStationBot
f510bf2a03 [MIRROR] Fixes master (#409)
* Fixes master

* adds missing #endif

* Revert "adds missing #endif"

This reverts commit 6e6124ed64ec7593e27a31393b54971c5050a5aa.

* master fix

* removes .rej
2017-04-15 15:44:00 -04:00
CitadelStationBot
b239a9620a PIXEL_SCALE Test [WIP] (#408) 2017-04-15 15:02:01 -04:00
CitadelStationBot
c38fa1eaa3 Finally kills off my old nemesis of the old fashioned inconsistent shuttle paths (#410) 2017-04-15 15:01:54 -04:00
CitadelStationBot
ba96400dd1 Remove atom stat cooldown (#407) 2017-04-15 14:51:22 -04:00
CitadelStationBot
71941d1b25 Removes 10 seconds from world init time. (#404) 2017-04-15 14:48:59 -04:00
CitadelStationBot
4f4390fe01 Renames the Cleanable/ folder to cleanable/ (#396) 2017-04-15 14:48:29 -04:00
CitadelStationBot
49cef72564 [s] Fixes RCD,RCLD & ARCD (#403) 2017-04-15 14:44:58 -04:00
CitadelStationBot
09572935ca [MIRROR] Fixes plasmamen burning to death in cloning pods (#382)
* Fixes plasmamen burning to death in cloning pods

* fix travis
2017-04-15 14:36:59 -04:00
Poojawa
9e72b1b8fd /tg/ 4/14 (#367)
* outside code stuff

* defines, helpers, etc

* everything not module

* modules

* compiled fixes + missing sounds
2017-04-14 23:28:04 -05:00
Poojawa
884fb45516 Fixes compile issues with vore code (#362)
* Fixes compile issues with vore code

* Update voreconstants.dm

* Update resize_vr.dm

* Update tgstation.dme

* Update parrot.dm

* Update pet.dm

* Update fox.dm

* Update mouse.dm

* Update farm_animals.dm

* Update dog.dm

* Update cat.dm

* Update monkey.dm

* Update alien.dm

* Update vore_vr.dm

* Update vorepanel_vr.dm

* Update bellymodes_vr.dm

* Update belly_vr.dm

* Update living_vr.dm

* Update voreconstants.dm

* Update fox.dm
2017-04-14 19:39:08 -05:00
Poojawa
7e9b96a00f April sync (#360)
* Maps and things no code/icons

* helpers defines globalvars

* Onclick world.dm orphaned_procs

* subsystems

Round vote and shuttle autocall done here too

* datums

* Game folder

* Admin - chatter modules

* clothing - mining

* modular computers - zambies

* client

* mob level 1

* mob stage 2 + simple_animal

* silicons n brains

* mob stage 3 + Alien/Monkey

* human mobs

* icons updated

* some sounds

* emitter y u no commit

* update tgstation.dme

* compile fixes

* travis fixes

Also removes Fast digest mode, because reasons.

* tweaks for travis Mentors are broke again

Also fixes Sizeray guns

* oxygen loss fix for vore code.

* removes unused code

* some code updates

* bulk fixes

* further fixes

* outside things

* whoops.

* Maint bar ported

* GLOBs.
2017-04-13 23:37:00 -05:00
LetterJay
2e285dff0b Merge pull request #335 from TaxMaster/VendingPartDuo
VG Vending 2: Free Market Boogaloo
2017-04-03 02:54:12 -05:00
ktccd
1a5ec9c3a2 Captain's Laser accessible by captain (#324)
Changes the access required from centcomm special ops to captain access.
Comment says it was on purpose, but seems poorly explained. As it is, a
lot of people don't seem to know display cases even CAN be opened. And
the gun is the captain's, why would it need special ops access to
retrieve?
2017-04-02 13:03:42 -04:00
TaxMaster
45548d26c6 THIS (DOESN'T) VIOLATE THE NAP
Clothing 2: If it doesn't pass i'm seriously going to stop trying
boogaloo
2017-04-01 22:50:05 -05:00
ktccd
37d46e87e6 Fixed verb problem
Now the syndi_borer shouldn't be able to use verbs to reproduce
(Previous PR only removed the action button on the HUD).
2017-04-01 03:28:01 +02:00
ktccd
0308042473 More borer work
Couple of changes.  Hopefully the objective is clearly defined now, and
it is separate from the team borers you normally have.
2017-04-01 02:49:59 +02:00
ktccd
c36a0845af Traitors/nukeops can now buy borers
This adds a subtype of borers to the traitor uplink. This version cannot
reproduce and is loyal to the owner who released it.
The borer's objectives are tied to the objectives of their owner and
will greentext together with them.
2017-04-01 02:48:16 +02:00
katnep
31d0f4cb1f Mining Vendor Redo (#298)
* Mining Vendor Redo

basically Re adds all the stuff i added back at the start of 6th port,
also re added stimpacks to the lsit becuase i don't see why they needed
to be removed from it

* whetstone removed

whetstone removed

* price balances

just tweaked the prices of the new bundles to make them actually worth
purchasing following a 5 for the price of 4 standard

* The final change

finishes the requested changes

* removes excessive line spacing

* removes trailing comma
2017-03-29 17:11:00 -04:00
LetterJay
d8d2bf1006 fix for missing area, map should load 2017-03-26 13:01:28 -05:00
TalkingCactus
c997ebcabd Removes Lag (tm) (#313)
* sensible fixes

* this too

* some more

* fixes chair icons

reverted to state before tg pull

* fixes telecomms icons

revert to state before tg pull

* fixes research icons

reverted to before tg pull

* de-whitewashed the stools

* fixed missing broadcaster sprites

* always load from the savefile

helps custom servers who don't want to fuck with the config, this will
never not be wanted with the system we have

* stop it, ghosts

* fixes limb augmentation

https://github.com/tgstation/tgstation/pull/25446

* removes lag

* re-adds sounds

* exception

* makes travis happy
2017-03-26 09:39:29 -04:00
LetterJay
fee5a75274 double fuck 2017-03-24 02:15:02 -05:00
LetterJay
e07580413f fuck 2017-03-24 02:08:02 -05:00
LetterJay
1d518bb4dd updates maploader, fixes a few things 2017-03-24 01:39:11 -05:00
Poojawa
7ad5e22830 Wew lad (#305)
* not code stuff

* other things

* global vars, defines, helpers

* onclick hud stuff, orphans, world.dm

* controllers and datums

* game folder

* everything not client/mobs in modules

* client folder

* stage 1 mob stuff

* simple animal things

* silicons

* carbon things

* ayylmaos and monkeys

* hyoomahn

* icons n shit

* sprite fixes

* compile fixes

* some fixes I cherrypicked.

* qdel fixes

* forgot brain refractors

* based cyberboss.

* you'd think github would suck less.

* vendors

* tweaks and specialty vendors.

* map things

* go away shitty omega

* qdeletion spam supress, maps.txt tweaks

* shuttle lights
2017-03-22 02:55:33 -05:00
Poojawa
f67e9f6d87 Bleeding edgy refresh (#303)
* not code stuff

* other things

* global vars, defines, helpers

* onclick hud stuff, orphans, world.dm

* controllers and datums

* game folder

* everything not client/mobs in modules

* client folder

* stage 1 mob stuff

* simple animal things

* silicons

* carbon things

* ayylmaos and monkeys

* hyoomahn

* icons n shit

* sprite fixes

* compile fixes

* some fixes I cherrypicked.

* qdel fixes

* forgot brain refractors
2017-03-21 11:44:10 -05:00
Squi-RL
099a6c8764 Ash drake plushie! (#300)
* Update toys.dm

Adds a cute little Ash drake plushie at the bottom

* Add files via upload

* Adds in hand icons for the ash drake plushie

* removed the commented out lines from the plush drake code
2017-03-21 05:47:47 -05:00
Verkister
df8d69535b New attempt at fixing shit. Also some sprite stuff.
-Messed around with another air proc I saw runtiming on server.
-Attempted to fix overlays even further. Test run successful but you never know with random chances that hopefully are now as low as the test run let me see.
-Meddled around with transit space. 2 directions were missing a corrective step against negative rng output.
-Added otie snouts.
-Improved contrast in the corvid markings.
-Added tail wag sprites for husky and otie.
2017-03-18 14:08:10 +02:00
ktccd
be0e52c2f0 Borer_chem_lewd_update (#276)
* Borer_chem_lewd_update

Added aphrodisiac and anaphrodisiac to the borer chemical list. Default
costs for now.

* Cloning-genitalia

Previously, clones had DNA for genitals, but not the organs. This should
give organs to any creature that has the DNA for them.

* Revert "Cloning-genitalia"

This reverts commit 67cac7775f1d8813638d3e77daaeed768822dfee.
2017-03-15 10:42:07 -04:00
TalkingCactus
09ec454325 Random Fixes + Dildos (#268)
* I'LL SNEAK THIS IN, TOO

* will it blend

* event tweaking

* new kinkmate sprite

* savefile bugfixes

* drinks got overwritten again

rip

* replaces missing styles

* dildos

* last bit
2017-03-10 12:51:16 -05:00
TalkingCactus
3a1d69cc63 Fixes Lattice Building (#263)
* allows construction of lattices again

https://github.com/tgstation/tgstation/pull/24674

* removes stray brig shutter from engineering windows
2017-03-05 06:51:18 -05:00
TalkingCactus
97327d2beb Hotfixes for March 3, 2017 (#260)
* fixes sterile mask box

* fixes admin map templates

https://github.com/tgstation/tgstation/pull/24581

* syndicate beacon refactor

https://github.com/tgstation/tgstation/pull/24612

* singularity tracking

https://github.com/tgstation/tgstation/pull/24609

* puddle description

https://github.com/tgstation/tgstation/pull/24601

* aux base landing fix

https://github.com/tgstation/tgstation/pull/24594

* comms console cooldown

https://github.com/tgstation/tgstation/pull/24579

* cult fixes + pronouns

https://github.com/tgstation/tgstation/pull/24590

* minebots now check for pressure

https://github.com/tgstation/tgstation/pull/24604

* fixes a very annoying spawn

https://github.com/tgstation/tgstation/pull/24588

* fixes false positive AI cheat check

https://github.com/tgstation/tgstation/pull/24558
mso is bae

* Fixes abductor surgery designs

https://github.com/tgstation/tgstation/pull/24593

* Allows transit space shuttle repairs

https://github.com/tgstation/tgstation/pull/24582

* fixes indentation error
2017-03-03 15:15:42 -05:00
TalkingCactus
84578c35cd New Sounds for Emitters, Fire Alarms, Sparks, and Maintenance Ambience (#258)
* new sparks sound

* new emitter sound

* new maintenance sounds

* non-overlapping fire alarm sound

* volume tweaking
2017-03-03 00:53:17 -05:00