Commit Graph

2771 Commits

Author SHA1 Message Date
Joan Lung
3858c3ef33 Failed clockcult conversions are more obviously failed (#22303) 2016-12-20 08:38:31 -05:00
Supermichael777
64ab376212 Makes the checks used by bibles better (#22171)
* makes these checks more flexable

* oh hai mark

* praise jesus

* magicaly a better understanding of how to structure if checks lets me cut 2 lines

* wew

* spellcheck

* i shoudent code drunk

* weeeeew

* llllllaaaaaadddddd

* madcusbad

* i realy should learn desktop git

* wew

* Im just so sorry

* because we can't be having the power of atheism melting clockcult.
2016-12-19 11:34:57 +13:00
Haevacht
a6711a7003 Tomb of the Dragoon, and the Sky Bulge lance (#22270)
* Sky Bulge Commit mk2

WORK THIS TIME.

* Indentation.

* Jordbord's suggestions

Incorporated. The bone spear line was also doubletabbed I was set up!

* FUCKING INDENTATION

* the flan update

they don't exist in world but here have a mob

* we fireflans now

also isliving is in now, just gotta actually map a thing

* the tomb update

it's bigger now

* .gitignore revert

* workpls

* Revert ".gitignore revert"

This reverts commit 1fefd34fc7c0dbc8f1f353a95e53665e03ba75cf.

* workthistime

* Revert "workthistime"

This reverts commit 214509d5abda941c470708431536ccd715334e8e.

* well it's the closest gitignore fix so far

* fix dme change

will need to be loaded for the map part to work though

* gitignorerevert take 43

* jordbord fix mk 2

* includes flan.dm in the .dme
2016-12-19 00:12:12 +11:00
XDTM
cddce20ba9 Adds combat tentacles for changelings (#22203)
* Combat tentacles

* wrong layer

* No spawn

* null and void

* /proc/
2016-12-18 19:49:45 +13:00
Incoming5643
123426b9c9 Fixes all the occasions where a wizard could find/make sandals and get the nerfed sandals instead of the new ones introduced in #22164 (#22237) 2016-12-17 14:22:46 -05:00
Joan Lung
b2fcbabb0b You can now push Wraith Spectacles up (#22188)
* You can now push Wraith Spectacles up

* you need to... actually LOSE the xray vision

* Don't flicker toooo much

* for bonus points, let's us refactor status effects while we're here

* might as well keep that around
2016-12-16 10:59:26 +13:00
Cheridan
b70c93defc Merge pull request #22177 from ChangelingRain/clocklogging
Adds a bit more logging to clockwork stuff
2016-12-15 15:20:01 -06:00
XDTM
7d1a67d0c8 Abductor tools and tool sound refactor. (#22125)
* Everything in the PR

* I'm taking that as a yes
2016-12-14 18:09:41 +13:00
Joan Lung
09dfc5253e more logs 2016-12-13 16:22:43 -05:00
coiax
2426bcb7d9 Adds "weighted random" AI law config (#22081)
* Adds "weighted random" AI law config

- Streamlines some duplicated code for law config stuff
- Makes a new "weighted random" option for AI laws, where an AI has a
random lawset, but some lawsets are more common than others.

80% normal, 20% quirky.

For those unwilling to source dive, here are the weights:

- 32% Asimov
- 12% Asimov++
- 12% Corporate
- 12% Robocop
- 12% Paladin

- 4% Maintain
- 4% Reporter
- 3% Hippocratic
- 3% Live and Let Live
- 3% Peacekeeper
- 3% Drone

* Law weights are now in the config file
2016-12-13 13:42:35 +01:00
Okand37
2b367d1154 Adds DeltaStation's emergency shuttle to the shuttle file list (#22106)
* Deltastation Playtest map

* Fixed Final Draft Deltastation Testmerge Playtest

* Fixed Final Draft Deltastation Testmerge Playtest and removes empty file

* Final Draft Deltastation bugs, issues, oversights fix 2.0

* More fixes!

* May the fixes guide you on your journey, brave undead

* minor fixes for the night

* more bugfixes 3.0!!

* Adds DeltaStation's emergency shuttle to the shuttle file list

* updating still not finished!

* more updates

* Update shuttles.dm
2016-12-13 17:42:21 +11:00
coiax
1428f3f532 Cyborgs have a reset module wire (#22016)
* Cyborgs have a reset module wire

🆑 coiax
add: Cyborgs now have a reset module wire, that when pulsed, triggers
the cyborg's reset module hardware.
/🆑

Because they can't touch it themselves for software reasons. Now you can
ask random assistants to reset you in a pinch, or do it on the FRONTIER.

* Upgrade ejection, removed reset board
2016-12-11 19:55:03 +13:00
Thunder12345
625e8f2d3d Minor Scrapheap Challenge fixes + making it ACTUALLY WORK (#22102)
* fuck

* stop
2016-12-10 15:12:56 -05:00
Thunder12345
1a240d82e8 Introducing the Standby Emergency Vessel, "Scrapheap Challenge" (#22009)
* Added fuckshuttle

* Converted to tgm

* In which cheridan ruins the joke

* reeeee
2016-12-10 10:29:40 +13:00
XDTM
ece186240b Fixes podcloning headless people (#22008)
* Blood for the plant god

* Professional debugging code

* New Deal
2016-12-09 09:08:30 +13:00
Joan Lung
a75f333f31 TGUI slab interface (#21987)
* tgui slab interface

* as is done
asking for help is a myth, taking help is not

* byond rides again

* do things and forget to fix them

* plus some bullshit

* info!
2016-12-08 10:17:28 -06:00
Kyle Spier-Swenson
dedb16826e Speeds up world init. (93s -> 49s) (#21992)
* Speeds up world init.

* Armor is now new inited for obj and the first level of subpaths.
* Actions is now lazyinited and deleted with empty.
* Actiontypes is now only inited when actually used and deleted once it pre-fills actions with the action buttons.
* Pipes now prefill their node list(s) in new() using new /list/ (count) syntax to speed up the list initaliztions and remove the init proc.
* Pipes no longer store their item version, instead creating it on the fly when deconned
* Walls no longer store their metal stacks, instead creating it on the fly when deconned.
* obj, walls, floor, plating, item, machinery, structure, pipe, pipenet, atom, and movable no longer have an (init) proc. (along with a few other smaller examples)
* Atmos can pass checking is now a var with the ability to have a proc be call in advance cases.
  * (as a side effect, I had to fix a few things that were calling atmosCanPass rather then using the pre-calculated list, this should speed up chemfoam and flame effects greatly)

* Reverts upload limit
(remind me one day to defuck this, it could easily be a config thats not editable by vv to make changes easier)

* Makes apc update icon a bit faster.
APC new is some what high on the profile of world init, still not sure why, but this stood out as a waste of cpu so i fixed it.

* Fixes runtime with atmos backpack water tanks.

* Makes smoothing faster (and fixes turfs smoothing twice at init)

* Makes apcs init faster by replacing some spawns with addtimer

* fix transit turfs.
2016-12-08 21:50:15 +13:00
oranges
073ddfd60c Merge pull request #21978 from ChangelingRain/removecoiaxlines
Removes a bunch of unnecessary lines
2016-12-08 10:23:07 +13:00
Joan Lung
081cf25de6 Removes a bunch of unnecessary lines 2016-12-05 23:01:58 -05:00
Cheridan
688e8b57b8 Merge pull request #21926 from KorPhaeron/shuttles
Allows adding prerequisites to purchasing shuttles
2016-12-04 20:48:26 -06:00
Joan Lung
551ede6d35 Kills all remaining text pronoun macros (#21916)
* Kills all remaining text pronoun macros

* review your own code

* oh right one further

* more

* \
2016-12-04 21:32:31 +01:00
KorPhaeron
c9dcd95473 Shuttle Requirements 2016-12-03 19:38:38 -05:00
Mervill
0972f78800 a_intent now uses defines 2016-12-02 22:27:30 -08:00
Mervill
c2e2440953 Merge branch 'master' into w_class
Conflicts:
	code/game/objects/items/weapons/twohanded.dm
2016-12-02 21:44:24 -08:00
Jordie
ca6ffdba40 Merge pull request #21866 from Mervill/slashes_deux
Remove slash from end of type refs/defs
2016-12-03 15:56:10 +11:00
Mervill
09ea5ad2e5 w_class now uses defines 2016-12-01 21:33:14 -08:00
Cheridan
89d3752276 Merge pull request #21584 from RemieRichards/swarmer_boss
Adds a new boss: Swarmer Swarm [Now a Ruin]
2016-12-01 07:47:54 -06:00
Joan Lung
a5ae025549 Replaces "specflags" with "species_traits" (#21851)
* Replaces "specflags" with "species_traits"

* this will do
2016-12-01 21:16:33 +13:00
Mervill
01d4232570 Remove slash from end of type refs/defs 2016-11-30 19:23:15 -08:00
oranges
c2295b8f21 Merge pull request #21841 from MrStonedOne/sadface
Fixes some shit that was annoying me about configs.
2016-12-01 12:12:59 +13:00
MrStonedOne
f75bfacb30 Fixes some bugs/runtimes. Makes vv var formating use less strings. 2016-11-30 12:50:16 -08:00
MrStonedOne
c1f8543487 Adds some dropdown options to lists
I was gonna make it so you could mark lists, but too much code assumed they had a .type and adding the proper istypes to them was too bloaty.
2016-11-30 12:50:16 -08:00
MrStonedOne
1f8d998600 Improvements and fixes 2016-11-30 12:50:15 -08:00
MrStonedOne
76e1c6916f VV refactor 2016-11-30 12:49:21 -08:00
Mervill
b5578df27d corrects some defs without leading slash (#21843) 2016-11-30 20:05:14 +13:00
MrStonedOne
62177b2734 Fixes some shit that was annoying me about configs.
Code files are less of an issue, but I have to ferry the config across linux and windows, and I don't want to have to care about the case of shit on the linux side.
2016-11-28 21:49:45 -08:00
Cyberboss
ae03c035a2 Fixes a negative sqrt 2016-11-28 16:30:48 -05:00
oranges
af7e6d1323 Fixes all remaining addtimers missed 2016-11-27 08:31:07 +00:00
Remie Richards
e95fa57f3a Swarmer Boss is now in a Ruin (Cost 20) 2016-11-25 17:58:49 +00:00
Remie Richards
c2d9c849b9 Merge branch 'master' of https://github.com/tgstation/-tg-station into swarmer_boss
Conflicts:
	code/modules/mob/living/simple_animal/hostile/hostile.dm
2016-11-25 17:14:20 +00:00
Cyberboss
e37f807941 Fixes the false armblade removal timer. Refactors addtimer (#21714)
* Clever girl...

* Make the addtimer unique param safe

* Refactor addtimer calls

* Moved the location of the define so the other SSs can use it
2016-11-25 22:05:58 +13:00
kevinz000
87dbd65811 [READY]] FLIGHTPACKS (AKA cooler, better, and technological wings with a unique gimmick!) (#20860)
* vroom

* wew

* a

* b

* morestuff

* .

* a

* .

* .

* basicsprites+extend/retract

* ...

* .

* thanks travis

* woops

* thankstravisv2

* redundence

* ishouldstopmakingsomanygoddamncommits+empdamage

* stuff

* ..

* ion_trails

* fixes_conflict_1

* fix

* compilesnow

* .

* fuck

* WIP: Multi Step Assembly

* thismightfixitthismightnot

* shoe-attachment

* noselfremoval

* wooops

* tweaksandcrashing

* runtimes

* runtimesfuntimes+crash update 1

* thisprobablywontcompile

* stillwip

* githubPLEASEWORK

* fixes conflicts 3/3

* REFACTORSUNTESTED

* fixingconflicts2

* fixingconflicts3/3

* updates

* stuffs

* ...

* stillWIP

* stufffs

* .

* ..

* runtimesfuntimes2

* stuffs2

* conflictfix

* ...

* fuck

* fix

* bah merge conflicts

* knockback_testing1

* conflictfixing...

* mergeconflicts

* plop

* socloseyetsofar

* tweaksandfixes

* conflicts

* fix

* fixes

* fix

* woops

* woops2

* hotfix

* ...

* flufftextandfixes

* test

* ..

* fix1/2

* stuff

* finallysomeoneteachesmehowtofixthisshit

* FIX

* why

* .

* bitflagsshitflags1

* bitflags-shitflags2

* bitflags-shitflags2

* bitflags_shitflags_4

* autofloating

* minerbuffgetthepun?

* notouchingfloors

* ...

* .

* f l o a t

* kek

* kek

* fixes

* fixes2

* sprites
2016-11-25 13:26:43 +13:00
Joan Lung
22c159ad3e Replaces the 'no cache' alert with an alert showing what you need for the next tier (#21689)
* Replaces the 'no cache' alert with an alert showing what you need for the next tier

* please make a base
please

* this can't be more dynamic, no

* duh, I can do this

* much better

* i'm just kor but with clocks
2016-11-25 13:25:56 +13:00
oranges
f0806cd368 Merge pull request #21647 from KorPhaeron/buildyourownshuttle
Allows captains to organize a shuttle build event
2016-11-25 10:13:53 +13:00
Joan Lung
6f2c8bc9f4 Fixes internals buttons (#21696)
* Fixes internals buttons

* i'm very happy with my own ui tbh
2016-11-24 21:20:32 +01:00
oranges
3c7f7582f1 Merge pull request #21680 from KorPhaeron/lavabase2
Syndicate Lava Base Remap
2016-11-24 10:28:57 +13:00
Joan Lung
e86d782625 Merge pull request #21639 from AnturK/fancybuttons
Makes action buttons use the hud themes.
2016-11-22 16:25:42 -05:00
KorPhaeron
3c769285e4 Syndicate Lava Base Remap 2016-11-21 20:37:05 -06:00
Leo
cc0071e720 Adds a config file to enable/disable shuttles from being bought (#21642)
* Adds a config file to enable/disable shuttles from being bought

* Remove useless comment
2016-11-22 11:53:51 +13:00
Joan Lung
f53fc311e6 Clockcult AIs get the ability to listen in through cameras (#21643) 2016-11-22 11:52:34 +13:00