Commit Graph

2866 Commits

Author SHA1 Message Date
Cheridan
07746bb332 Merge pull request #24035 from ChangelingRain/betterclockai
Clockwork AIs are cooler
2017-02-14 14:24:39 -06:00
Leo
9c6803ae19 Ports Paradise error handler, with in game runtime viewer! (#24036)
* Ports paradise error handler, with in game runtime viewer!

* Changes to the old runtime error and removes inerror reference

* Oops

* Adds a wrapper for world.log so it displays both in the runtime diary and in DD window
2017-02-14 11:39:31 +11:00
Joan Lung
7f5a0b8153 remove that line 2017-02-12 19:44:27 -05:00
Joan Lung
423c3130f4 Clockwork AIs are cooler 2017-02-12 19:42:34 -05:00
Cheridan
da77946b2a Merge pull request #23963 from RandomMarine/dontgetrektcomrade
Mother Russia Bleeds shuttle.
2017-02-12 04:05:32 -06:00
coiax
e4e192c3a3 BYOS shuttle restrictions (Shuttle changes #1) (#23904)
* BYOS shuttle restrictions (Shuttle changes #1)

🆑 coiax
add: The Build your own shuttle kit can only be bought in the first five
minutes of the shift.
/🆑

- BYOS restriction is to avoid grief.

* Moves the defines

* Ten minutes
2017-02-12 14:13:44 +13:00
oranges
90c3b06bbd Merge pull request #23905 from coiax/shuttles-3
Removes shuttle STV5 from purchase (Shuttle changes #3)
2017-02-12 14:13:26 +13:00
RandomMarine
f663e54dd2 Adds Mother Russia Bleeds shuttle 2017-02-10 22:08:58 -08:00
Joan Lung
be54c89258 Merge pull request #23788 from KorPhaeron/theworstshuttle
Arena Shuttle
2017-02-10 18:54:28 -05:00
Cyberboss
2f90da2127 HEAVY FUCKING BREATHING (#23935) 2017-02-10 12:14:43 -06:00
KorPhaeron
f1374d1730 Merge branch 'master' into theworstshuttle 2017-02-10 11:27:34 -06:00
coiax
4f43d0d42b Reduces cost of NES Port shuttle (Shuttle changes #5) (#23907)
🆑 coiax
add: The NES Port shuttle now costs 500 credits.
/🆑

It's large, but lacking in a lot of the basic supplies that nearly all
other mainline shuttles have. Its current cost is too much.
2017-02-10 10:04:27 -06:00
oranges
5798ce24fe Merge pull request #23865 from Cyberboss/patch-6
Fixes Testmerge list duplication
2017-02-10 20:30:31 +13:00
kevinz000
70dba6e3c8 [READY]Allows people to ride around on cyborgs (#23440)
* cyborg_riding_revival

* Knockoff Damage

* ...

* Restraint checks

* Update silicon_defense.dm

* Fixes throwing humans through a wall...

* no cyborg stacks

* wew wew human harm wew wew

* Fix

* ...

* FOR_THE_LOVE_OF_GOD_WILL_YOU_JUST_FIX_PLEASE

* armchecks

* ... What?

* Fixes..

* .

* honk

* stuffs

* fixes

* fine basilcuck

* fixes

* done

* eMAAAGS

* f i x e s

* this better fucking fix reee ;-;

* fix?!

* all_ready

* hm.

* fixes

* fixes...

* woops

* fixes

* defines

* ready
2017-02-10 20:22:40 +13:00
Cyberboss
8e1351a06f Faster, non-blocking world init (#23136)
* Moves turf New calls to Initialize

* Much faster

* Fixed

* Makes add_to_active queue up before SSair is initialized

* Remove active queuing

* And the proc

* Move the check

* Fix some shit

* F U C K T U R F S

* Necessary

* Unnecessary

* SHUT THE FUCK UP

* Panic mode hurts the code

* Such a

* Simple answer

* A well thought out plan

* /turf/open optimization

* Undo the warning suppression now that it's fixed

* Fixes lava typecaching badly

* Added late initialization

* Make the atmos offenders late initialize

* Add extra logging

* GLABALS

* Better solution for trying to activate w/o air

* Further base calling copypasta

* Gates, guards, gorans

* Small doc fix

* Do the faster

* T U R F   V A R   P E R S I S T E N C E

* The solution is always so simple

* The (hopefully) final nail in the coffin
2017-02-10 16:53:08 +13:00
Jack Edge
ade898a566 Removes shuttle STV5 from purchase (shuttles #3)
🆑 coiax
del: Removes the STV5 shuttle from purchase.
/🆑

STV5 was an admin punishment shuttle, I never envisioned the station
willingly buying it, and it serves as a horrible deathtrap inflicted by
people making poor designs. Our shuttle purchase system doesn't allow
changing, so removing it for now.
2017-02-09 16:14:16 +00:00
Cyberboss
8baa487275 Fixes Testmerge list duplication 2017-02-08 13:24:17 -05:00
kevinz000
0ced9342b9 [READY]Aimable wizard lightning bolts (#23723)
* ZAP!

* YOU DID NOT SEE THAT

* YOU DI NOT SEE THAT 2

* object orientated pr

* gdi

* protection

* object orientated pr v2

* REEEE

* blacklists

* Update magicarp.dm
2017-02-08 18:31:52 +13:00
kevinz000
5f7d6844fa Fixes emitter pulsing firing beams without actually needing energy (#23774)
* Update emitter.dm

* Update emitter.dm

* Update emitter.dm
2017-02-08 18:28:14 +13:00
oranges
f57b6c2f21 Merge pull request #23785 from coiax/guardian-of-balance
Adds 'Guardian of Balance' AI lawset
2017-02-08 18:26:30 +13:00
oranges
e56743458e Merge pull request #23629 from XDTM/TheLAW
Adds a Law Removal Module, other minor law changes
2017-02-08 18:21:26 +13:00
KorPhaeron
a2c9af8abf Arena Shuttle 2017-02-06 14:54:58 -06:00
Jack Edge
515f5b69c2 Adds 'Guardian of Balance' AI lawset
🆑 coiax
add: Adds a 'Guardian of Balance' lawset and AI module, currently admin
spawn only.
/🆑

- Also refactors some of AI_modules.dm to use the /datum/ai_laws stuff
to avoid law duplication.
2017-02-06 18:20:54 +00:00
Cyberboss
5b7e4af612 Makes simple_animals deathgasp (#23716)
* Allows simple_animals to have specific emote text

* Makes simple_animals deathgasp
2017-02-06 18:30:17 +13:00
Pieter-Jan Briers
43fd486f82 Adds a hook for changing view size. (#23690)
* Adds a hook for changing view size.

* """"coding standards""""
2017-02-06 01:01:12 +13:00
Cyberboss
b86e224571 Makes qdeleted and qdestroying macros (#23666)
* Makes qdeleted and qdestroying macros

* Makes QDELETED and QDESTROYING uppercase

* Swap qdel checks istype's for != null's

* Fix it

* How was this missed?
2017-02-06 00:59:27 +13:00
Joan Lung
027290de05 Ratvar-converted AIs become brass-colored, speak in Ratvarian, and cannot be carded (#23664)
* Ratvar-converted AIs become brass-colored, speak in Ratvarian, and cannot be carded

* bro you're super rogue

* that'd be smart
2017-02-04 11:34:51 -06:00
Joan Lung
1a7346c29a nobody uses this 2017-02-02 11:22:03 -05:00
Joan Lung
ad6d33400e Vanguard now shows you how long you have until it deactivates. 2017-02-02 11:19:11 -05:00
XDTM
eb5086a307 Misc law changes 2017-02-02 12:18:49 +01:00
coiax
0df599a518 Transformation diseases do not change your name (#23499)
🆑 coiax
add: A victim of a transformation disease will retain their name.
tweak: The slime transformation disease can turn you into any colour or
age of slime.
/🆑

Polymorphed people keep their name, so why not transformation diseases.
And colourful slimes are fun, and the slime disease requires a high tier
of slime anyway, and if you're going to infect humans with the disease
in order to harvest slimes, then that's probably a feature.
2017-02-01 20:18:20 +01:00
oranges
773ac59ff8 Merge pull request #23514 from AnturK/mixedlisttypesneveragain
Fixes game mode odds (again)
2017-02-01 15:55:07 +13:00
Cyberboss
f11c339ebc Make progress bars stack vertically (#23516)
* Make progress bars stack vertically

* Move progress bars to the HUD layer
2017-02-01 15:54:52 +13:00
Cyberboss
a4d5579f79 Initialize Safety Cleanup (#23274)
* Better `in world` Initialization handling

Remove spawn_atom_to_world and SSobj.atom_spawners

Roll SSobj/setup_template_objects and SSobj/Initialize into new generic proc

* >BYOND

* >var names

* Defines

* Actually remove the spawn_atom_to_world definition

* A note on NOT CALLING THE BASE

* Remove set waitfor = 0

* My comments are cool

* In order to prevent just that...
2017-02-01 15:48:17 +13:00
AnturK
d816623aeb Fixes game mode odds 2017-01-30 22:27:36 +01:00
Militaires
d45092eb8a VROOM (#23311)
🆑 BASILMAN YOUR MAIN MAN
add: Added BM SPEEDWAGON THE BEST (AND ONLY) SPACE CAR ON THE MARKET.
/🆑
I PRESENT THE BM SPEEDWAGON

THE FRONTIER IN VEHICLE TECHNOLOGY, DRIVE ON THE PURE POWER OF THE STARS, RUN PEOPLE OVER, MOVE REALLY FAST DOWN THE HALL, PICK UP HOES*

this is intended for wizards at some point but ill leave that for another pr because i fear the balance meme flocks.

this was fun to make, and hopefully fun to watch operate.

eliminates #23170
2017-01-31 09:35:46 +13:00
Cyberboss
3f7f5d4000 Removes/Refactors /mob/unEquip (#22918)
* Part1

* IT COMPILES!!!!

* Fuck wait this was missing from that last

* Update handlabeler.dm

* Update handlabeler.dm

* Fixes n shit

* Fix this

* Fixes #23310

* Fucking @RemieRichards was right

* Fixes devil unEquip

* WTF ARE BITFLAGS?

* THERES THE FUCKING PROBLEM

* Fixes
2017-01-31 09:28:31 +13:00
Cyberboss
f7c9749ca0 Fixes some bad addtimer calls. Adds INVOKE_ASYNC. Replaces addtimer(..., 0) (#23424)
* Fixes some bad addtimers

* Adds INVOKE

* Warning for addtimer

* Working syntax

* Another bad call

* Fixes the addtimer warning

* Add suppress_zero_warning to addtimer

Useful for addtimer that uses vars

* Add INVOKE_AGAIN for when the var is already defined

* Replace addtimer(...,0) with INVOKE((...))

* Much more sensible syntax

* Less overhead, less copypaste

* Rename INVOKE_ASYNC

* Use a macro

* Allman style

* Wait, why make it a datum in the first place?

* Revert the rename

* Rename again, keep line endings

* typo

* More typos

* Untouches Addtimer

* Update callbacks.dm

* Update timer.dm

* Revert allman style

* Revert "Revert allman style"

This reverts commit 47361da15bd04eca138be5f13acdc9dd5ba89331.

* Trying to match that whitespace diff

* Why is this missing?

* I'm not fucking dealing with this!
2017-01-31 09:20:54 +13:00
Cruix
74f0214a14 Made temporary martial arts not override sleeping carp (#23287)
* Made temporary martial arts inherit the inability to use guns from their base martial art.

* Made sleeping carp not able to be overridden by temporary martial arts

* Made sleeping carp respect the make_temporary parameter
2017-01-30 10:04:52 +13:00
coiax
6158cf3f52 EMPing will sometimes randomly pulse wires (#22676)
* EMPing will sometimes randomly pulse wires

🆑 coiax
add: EMPs may cause random wires to be pulsed. Please ensure that
sensitive equipment avoids exposure to heavy electromagnetic pulses.
/🆑

10% wire pulse chance, maximum of 3 pulses per atom per EMP.

* Fixes runtime when EMPs pulse the airlock wire

* 33% of a wire pulse
2017-01-30 09:42:28 +13:00
Core0verload
6c2f5a4b71 Genocides "_s" in icon states (#23366)
* Genocide of "_s", part 1: mutations

* Genocide of "_s", part 2: aliens

* Genocide of "_s", part 3: augments

* Genocide of "_s", part 4: facial overlays

* Genocide of "_s", part 5: underwear

* Genocide of "_s", part 6: uniforms

* Genocide of "_s", part 7: animal body parts

* Genocide of "_s", part 8: human body parts

* Adds back icons used by hallucinations

* Changes some icon states from "broken" to "still broken"
2017-01-29 11:22:24 -06:00
Militaires
65aa7782f4 genocides riding runtimes for lzimann and fixes other issues too #23135 (#23170)
* sleepight pupper

* boop

* boom explosion habbon

* wew ladder.

kor tell me the varname cock tobbagan dont just tell me it exists and you dont poin

* bambi in spess

* more shitfuck

* GOD DAMMIT ITS GONNA BE FUCKING HOT AAA

* commit this dick you fucking tub

* GIGANTIC REFACTOR 2.0

* OH YEAH THE CREAM RISES TO THE TOP

* antur

* aaaaaa

* boat

* wew ladder

* bman

* yaaaaaaaaaaaaaaaaaaawwwwwwwwwwwwwwwwwww

* STEEL CORRIDOR

* fuck my shitfuck

* DON

* so i walk up to the police in detroit city and im like excuse me officer but im tryna find some weed, and he's like shit so are we why dont you roll with me, we'll go around pulling over some minorities

that's what im talkin about

get up in the police ride. pop a 50 oz inside, nigga we be gettin HIGH .memememememe. we be going 60 when we see a trick-ass bitch, we gonna ask a hoe to drop them titties

go cops, get the dogs, let's go storm the barber's shop

* i walk into a airplane like bro man salam this will be bumpy ride put your seatbelt on

* what about you

* BRO MAN SALAM

* boom bim bam done

* ewewewewew
2017-01-28 17:49:49 +01:00
Leo
d215e0ca4b Removes deepstorage ruin and fixes blackbox stats gathering (#23407)
* Removes deepstorage ruin.

* lziisanerd

* jordieisanerd
2017-01-28 14:28:21 +01:00
Cheridan
f81749a704 Merge pull request #23238 from kevinz000/autism_fort_1
Autism Fort Patch - Emitters and Tesla coils can now be used for DEFENDING YOUR TURF!
2017-01-27 17:44:25 -06:00
AnturK
e6169e8d42 Minor AI fixes. (#23105)
* Fixes #20469

* Fixes #9062 again.

* Fixes #10283
Laws above 20 will replace laws of same or lower importance.
2017-01-26 19:40:45 -06:00
Cyberboss
d338467755 Fixes /datum/Beam failing to GC (#23285) 2017-01-26 09:39:55 +01:00
AnturK
12978dd350 Fixes show-rev gamemode odds (#23304) 2017-01-25 09:51:19 -06:00
Joan Lung
9db41ec546 Soul Vesseled corpses can be consumed by Vitality Matrices (#23158)
* Soul Vesseled corpses can be drained by Vitality Matrices

* L.

* scarabs don't need this
2017-01-25 03:34:50 +04:00
Cyberboss
ab9f1f0448 It's 2017, time to fuck (some) spawns and cleanbots (#22801)
* Spawn -> addtimer

* Remove this unused proc

* Oh boy, there he goes touching MC again

* Remove spawn in flick_overlay

* Remove spawn in pollCandidates

* flash_color: waitfor = 0

* Don't mess with my grepping, comments

* clear_fullscreen: waitfor = 0

* Why the hell was telekinisis not using the define?

* check_for_cleanbot_bug: waitfor = 1

* Failsafe loop launcher

* assets: waitfor = 0

* Ticker nuke cleanup: addtimer

* ticker post setup: addtimer

* ticker cinematic cleanup: addtimer

* Revert "Why the hell was telekinisis not using the define?"

Handled in #22803

This reverts commit 1da293e687f1811ae69001cb02dfa6f15f451354.

* ticker maprotate: addtimer 0

* beam start: addtimer 0

* browser onclose setup: waitfor = 0

* Revert "check_for_cleanbot_bug: waitfor = 1"

This reverts commit 99e50724b3bc6a3682d042b36f97c906c7f7d96d.

* Finally remove check_for_cleanbot_bug

* browser timeout: addtimer

* deafness symptom: addtimer

* Shedding symptom: addtimer

* Animate doesn't sleep

* MSOs stuff

* > Tfw you committed without saving
2017-01-23 21:06:30 +04:00
kevinz000
d30dcb1f8c Merge branch 'master' into autism_fort_1 2017-01-23 00:38:45 -08:00