Commit Graph

6358 Commits

Author SHA1 Message Date
Joan Lung
f74359e695 Merge pull request #26193 from Robustin/future5
Engimarket 3, The Third III: Fucking Dance Machine
2017-04-14 22:07:02 -04:00
Joan Lung
469557095d Merge pull request #26197 from coiax/fixes-op-not-exploding
Fixes op death just opening a polite window asking if you want to activate your explosive implant
2017-04-14 22:03:29 -04:00
Iamgoofball
8af63d5fd2 Tracks station renames. (#26051)
* Tracks station renames.

* addresses jordie's request
2017-04-14 10:44:40 +02:00
octareenroon91
02f81a091f Fix twohanded quick-equip (#26172)
Fixes #26105
2017-04-14 01:51:03 -06:00
Robustin
7db828644c EngiMarket Part Four - Ranged RCD and Rapid Lighting Device (RLD) (#25263)
Two new items, one brand new, the other an RCD that works at range without any other bells and whistles.

The RLD allows you to create floor and wall lighting along with temporary (they use fuel like flares) glowsticks at range. It can also deconstruct lights. The best part of this feature (besides the visual "ammo" updating icons) is the ability to select absolutely any color you desire.

🆑 Robustin
add: Ranged RCD added to the game
add: Rapid Lighting Device (also ranged) has been added. It can create wall, floor, and temporary lights of any color you desire.
/🆑
2017-04-14 09:31:43 +12:00
Jack Edge
a7b94fcdf9 Fixes ops not exploding on death if their manual trigger window is open 2017-04-13 21:54:21 +01:00
Robustin
85a8b89cfa no more "null" 2017-04-13 14:48:42 -04:00
Davidj361
dfef186597 Fix for bug #25899 (spray guns) (#26102)
* Fix for bug #25899 (spray guns)
- Made it so chemsprayers and extinguishers don't spray when you click your inventory items
- Spray guns now actually have their range change when changing modes between spray and stream

* Fix for bug #25899 (spray guns)
- Made it so chemsprayers and extinguishers don't spray when you click your inventory items
- Spray guns now actually have their range change when changing modes between spray and stream

* Changes suggested by duncathan
2017-04-12 19:53:51 -06:00
Joan Lung
84886b3f4f Misc logging changes (#26116)
* Misc logging changes

* conniptions
2017-04-12 18:49:32 -06:00
coiax
de35ec5f67 Partial sparks boilerplate reduction (#26081)
* Partial sparks boilerplate reduction

- Lots of obects are making `/datum/effect_system/spark_spread`, setting
them up, firing them, and then not qdeling them afterwards.
- Makes a `do_sparks` global proc that takes the same arguments as `set_up`
and then calls `start` and then `qdel`
- Switches a bunch of things to use this proc
- Makes emitters keep their own spark_spread datum around, since they
spark so damn much.
- Also makes some things use timers and ports some things to Initialize.

* Compilation
2017-04-12 19:59:45 +02:00
Leo
7288466d17 Merge pull request #26089 from ExcessiveUseOfCobblestone/patch-24
Eightball Hotfix
2017-04-12 07:22:52 -03:00
coiax
5c6d0a96b1 Fixes cigarette branding and taste (#26030)
* Fixes cigarette branding and taste

🆑 coiax
fix: Cigarette branding has been fixed.
add: Uplift Smooth brand cigarettes now taste minty as advertised.
del: You can no longer inject cigarette packets to inject all cigarettes
simultaneously.
/🆑

- Makes subtypes of all the brands of cigarettes, and sets them to the
packets, removes the brand var and the special casing initializing that
had to be done for it.
- Adds "menthol", a do nothing drug chemical that tastes of mint to
Uplift Smooth (because they say they taste of mint, so we're fixing bugs
in the user's experience)
- Cigarettes now have a "list_reagents" var, for specifying their
initial reagents mix, like `reagent_container`

* Only trippy rollies start lit

* RRR
2017-04-12 21:14:22 +12:00
4dplanner
2f1f0da5be Adds another can_inject check just before injecting (#26001)
* Adds another check before injecting/applying medicals stacks

* More helpful comments

* Updates to use extra_checks
2017-04-11 15:25:07 +02:00
kevinz000
5033c39e58 Fixes chameleon projectors accepting bad sprites (most of the time) (#25786)
* Update chameleonproj.dm

* Update chameleonproj.dm
2017-04-11 20:58:43 +12:00
ExcessiveUseOfCobblestone
f5f7a79218 Update eightball.dm 2017-04-10 23:33:38 -04:00
AnturK
fcc1239b7c Fixes #24120 (#26040) 2017-04-10 18:07:16 -03:00
Robustin
e76f6186f9 Update flashlight.dm 2017-04-10 14:07:39 -04:00
Robustin
0d47913054 Remie changes 2017-04-10 14:06:28 -04:00
oranges
6c457849ca Merge pull request #25951 from JJRcop/livingwhisper
Merges whisper verb into saycode, extends to all living mobs
2017-04-10 10:45:28 +12:00
Cyberboss
c697435dd1 Makes welders deterministic (#25937)
* Makes welders deterministic

* What he said
2017-04-10 10:42:14 +12:00
Cheridan
b0c800041e Merge pull request #25959 from ChangelingRain/movefiles
Moves GPSes and bluespace crystals to appropriate folders
2017-04-09 01:54:48 -05:00
coiax
1e338e5884 Ports storage objects to Initialize (#25992)
All storage objects now populate their initial contents with the PopulateContents proc.
2017-04-08 19:28:28 -03:00
Joan Lung
7092702dfc maybe if I fuck with everything it'll get better 2017-04-08 12:41:22 -04:00
Joan Lung
bbf14f769d It didn't fix the line endings 2017-04-08 12:40:18 -04:00
Joan Lung
59eae3e871 this is supposed to fix the line endings 2017-04-08 12:36:10 -04:00
Joan Lung
825bbb13fe GLEB 2017-04-07 12:42:49 -04:00
Joan Lung
fa758dc418 GLOB 2017-04-07 12:25:29 -04:00
Robustin
123a45ea9b Merge branch 'master' into future5 2017-04-07 10:16:06 -04:00
Lzimann
d40760ad71 Fix conflicts 2017-04-07 09:12:36 -03:00
Lzimann
a2008ff8c6 Fixes stupid idea 2017-04-07 09:00:22 -03:00
JJRcop
afa847bf35 Merges whisper verb into saycode, extends to all living mobs
Removed all #a #b #c radio
removed :W .W radio
prefix speech with # to whisper
2017-04-07 02:23:47 -04:00
Cyberboss
9e1ef0ffe2 Global variable wrappers (#25325)
* Add the system for managed global variables

* Travis ban old globals

* So you CAN inline proccall, that's neat

* Fix that

* master.dm

* Remove the hack procs

* Move InitGlobals to the proper spot

* configuration.dm

* Fix the missing pre-slash

* clockcult.dm

* This is probably for the best

* Doy

* Fix shit

* Rest of the DEFINES tree

* Fix

* Use global. for access

* Update find_references_in_globals

Always hated that proc

Whoever made it must've bee a r e a l idiot...

* __HELPERS tree

* Move global initialization to master.

Fix the declaration

* database.dm

* Dat newline

* I said DECLARATIVE order!

* Here's something you can chew on @Iamgoofball

* game_modes.dm

* Fix this

* genetics.dm

* flavor_misc.dm

* More stuff

* Do it mso's way. Keep the controllers as global

* Make master actually see it

* Fix

* Finish _globalvars/lists

* Finish the rest of the _globalvars tree

* This is weird

* Migrate the controllers

* SLOTH -> GLOB

* Lighting globals

* round_start_time -> ticker

* PAI card list -> pai SS

* record_id_num -> static

* Diseases list -> SSdisease

* More disease globals to the SS

* More disease stuff

* Emote list

* Better and better

* Bluh

* So much stuff

* Ahh

* Wires

* dview

* station_areas

* Teleportlocs

* blood_splatter_icons

* Stuff and such

* More stuff

* RAD IO

* More stuff and such

* Blob shit

* Changeling stuff

* Add "Balance" to changelogs

* Balance for changelog compiler + Auto Tagging

* Update the PR template

* hivemind_bank

* Bip

* sacrificed

* Good shit

* Better define

* More cult shit

* Devil shit

* Gang shit

* > borers

Fix shit

* Rename the define

* Nuke

* Objectives

* Sandbox

* Multiverse sword

* Announce systems

* Stuff and such

* TC con

* Airlock

* doppllllerrrrrr

* holopads

* Shut up byond you inconsistent fuck

* Sneaky fuck

* Burp

* Bip

* Fixnshit

* Port without regard

* askdlfjs;

* asdfjasoidojfi

* Protected globals and more

* SO MANY

* ajsimkvahsaoisd

* akfdsiaopwimfeoiwafaw

* gsdfigjosidjfgiosdg

* AHHHHHHHHHHHHHHHHHHHHHHH!!!!!

* facerolll

* ASDFASDFASDF

* Removes the unused parts of dmm_suite

* WIP

* Fix quote

* asdfjauwfnkjs

* afwlunhskjfda

* asfjlaiwuefhaf

* SO CLOSE

* wwwweeeeeewwwww

* agdgmoewranwg

* HOLY MOTHER OF FUCK AND THATS JUST HALF THE JOB?!?

* Fix syntax errors

* 100 errors

* Another 100

* So many...

* Ugh

* More shit

* kilme

* Stuuuuuufffff

* ajrgmrlshio;djfa;sdkl

* jkbhkhjbmjvjmh

* soi soi soi

* butt

* TODAY WE LEARNED THAT GLOBAL AND STATIC ARE THE EXACT SAME FUCKING THING

* lllllllllllllllllllllllllllllllllllllllllll

* afsdijfiawhnflnjhnwsdfs

* yugykihlugk,kj

* time to go

* STUFFF!!!

* AAAAAAAAAAAAAAAAAHHHHHHHHHHHHHHHHHHHHHHHHHHH!!!!!!!!!!!!!!!!!!!!!!!

* ngoaijdjlfkamsdlkf

* Break time

* aufjsdklfalsjfi

* CONTROL KAY AND PRAY

* IT COMPILEELEELELAKLJFKLDAFJLKFDJLADKJHFLJKAJGAHIEJALDFJ!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

* Goteem

* Fix testing mode

* This does not belong in this PR

* Convert it to a controller

* Eh, fuck this option

* Revert controllerization Ill do it some other time

* Fix

* Working controllerization

* FOR THE LOVE OF CHRIST PROTECT THE LOGS

* Protect admins and deadmins

* Use the inbuilt proc
2017-04-06 23:26:13 -06:00
Lzimann
3a20f37034 Fixes chaplains not being able to assign their deity/religion plus some minor refactor of the religion subsystem 2017-04-06 23:44:13 -03:00
Joan Lung
fa50886ee2 kill me 2017-04-06 19:43:12 -04:00
Joan Lung
bbd81a1a30 eh, no change 2017-04-06 19:30:06 -04:00
Joan Lung
9acc3735c5 with bonus fixes 2017-04-06 19:22:44 -04:00
Joan Lung
d4f9d71209 Moves GPSes and bluespace crystals to appropriate folders 2017-04-06 19:03:00 -04:00
Robustin
5719365a0a Merge branch 'master' into future5 2017-04-05 15:31:34 -04:00
AnturK
ff1b14763c Fixes language bad arg 2017-04-04 10:25:44 +02:00
ExcessiveUseOfCobblestone
32f957dbf0 Time to use this broken glass on Cyberboss! (#25816)
* CYBERBOSS!!!!

* citrus
2017-04-04 09:07:03 +12:00
Cyberboss
22fe5b12f1 Merge upstream 2017-04-02 22:27:22 -04:00
coiax
7554b5f454 Language datums; removes the talk wheel (#25333)
* Initial burst of languages

* Scratchings of beginnings

* Code review I

* Compilation!

* You can now understand your own speech

* Fixes whispering

* Gets typecaches working again

* Remie's `PASS`ing

* Back to pass() to stop the compiler whining

* Why can't drones check their languages

* Everyone speaks how they should

* Removes world string debug stuff

* Currently failing to massage radio code into working

* The radio transmits the languages!

* ,0 to talk common

* Replaces speech wheel with language menu

* Observers can speak all languages

* pAIs now speak languages FOREVER

* New action button for language menu

* pAIs have an action button to open their language menu

* AIs can talk and all that

* AIs have a language menu button

* Fixes supermatter making strange noises

* Fixes AI holopads

* Fixes request consoles

* Fixes bots making strange sounds

* Meaningless MMI change

* Some caching of datums

* Brains in MMIs speak common

* Ratvarian AIs can only speak Ratvarian

* Tables can speak common, apparently

* Removes var in args

* Fixes the (AI Eye) problem

Thanks to Shadowmobile for their help with this one.

* Fixes tape recorders

* Fixes humans being able to speak in languages they did not know

* Adds some new posibrain names

Honk.

* The voice analyzer replies in the language you spoke to it

* Gives swarmers only swarmer language

* `initial_languages` var.

* OMNITONGUE, clockwork restrictions

* Fixes barmaid and bardrone language abilities

* Code review I

* Omnitongue correction

* Code review II

* Removes force_compose var
2017-04-02 21:03:40 +02:00
duncathan salt
b6f4f78de9 Merge pull request #25753 from kevinz000/patch-109
Fixes ERT IDs
2017-04-02 02:15:06 -06:00
duncathan salt
e3cfa075bf Merge pull request #25747 from kevinz000/patch-107
I ded pls fix: Stunbatons are the best counter against syndicate cyborgs
2017-04-02 02:12:50 -06:00
Cyberboss
78ee754da3 Merge upstream 2017-04-01 23:38:37 -04:00
kevinz000
c7adb60959 Update cards_ids.dm 2017-04-01 17:40:48 -07:00
AnturK
8cbbd9ea0f Fixes chem implants (#25729) 2017-04-01 21:35:52 -03:00
kevinz000
abb60db779 Update cards_ids.dm 2017-04-01 00:50:46 -07:00
kevinz000
ad4251b0d6 Update stunbaton.dm 2017-03-31 18:53:01 -07:00
bgobandit
0f1c4cb4a2 Fixes the energy cutlass. (#25636) 2017-03-31 09:37:15 -03:00