Commit Graph

213 Commits

Author SHA1 Message Date
XDTM
28a5901170 You can now click on symptoms in the Pandemic to see their description and stats (#29866)
* You can now click on symptoms in the Pandemic to see their description and stats

* Threshold info

* NO WHITESPACE
2017-08-19 19:52:09 -04:00
Ian Turk
7460f2c5b8 Replaced flags with flags_1 2017-08-16 13:01:15 -06:00
Ian Turk
1b7ca8c0e5 Resolved merge conflicts 2017-08-16 08:33:24 -06:00
Jordan Brown
af4d9a85c9 Repaths /obj/item/weapon to /obj/item (#29929) 2017-08-16 10:38:51 -03:00
Ian Turk
371f1ba4f0 Replace all secondary flags with bitflags stored in the flags_2 var 2017-08-15 16:01:35 -06:00
Kyle Spier-Swenson
2faec70007 Fix compile warning 2017-08-14 00:58:15 -07:00
MrStonedOne
d7a507d412 Clean up some inputs 2017-08-13 22:29:58 -07:00
Lzimann
58d0f12c5c Removes a great amount of machinery copypasta with circuitboards.
Also changes New -> Initialize in most of them.
renamed: `code/game/machinery/computer/computer.dm` -> `code/game/machinery/computer/_computer.dm`
renamed: `code/game/machinery/machinery.dm` -> `code/game/machinery/_machinery.dm`
Moved all circuitboards to a new folder at `code/game/objects/items/weapons/circuitboards`
2017-08-09 11:10:48 -03:00
shizcalev
22764665c9 CentCom Standardization 2017-08-07 19:04:27 -04:00
pubby
866f928ec2 Fixes a cliffhanger comment. 2017-07-30 09:11:32 -05:00
ShizCalev
d525b18d8d Completes major inhand split project (#29574)
* Completes split project

* More work on it. Should be more or less finished
2017-07-29 16:47:37 -03:00
shizcalev
8ebf6b6a43 cleaned up paper 2017-07-26 05:35:05 -04:00
ShizCalev
45d3d52af7 Made some object lists less terrible to read (#29304)
* spaces

* more spaces

* last ones
2017-07-18 10:44:29 -04:00
kevinz000
0833a9002f Ports instruments from /VG/station, including harmonicas, xylophones, saxophones, trombones, and a BIKE HORN. Repaths instruments to sound/instruments. Also, allows piano synth to play all instruments but eguitar and gives cargo a crate with everything. Clown gets the bike horn trumpet at roundstart. (#29277)
* multiext

* instruments

* kekkles

* clown

* Update instruments.dm

* Update packs.dm

* Update packs.dm

* Update instruments.dm

* Update action.dm

* typo

* Update instruments.dm
2017-07-16 12:48:51 -04:00
Leo
ca59ca6c23 Changes all access const to be a define (#29260) 2017-07-16 18:44:23 +02:00
ShizCalev
db10f35703 Cleaned up some emag_acts (#29238)
* cleaned up some emag_acts

* Randomized spark sounds

* Made sparky looking things sound sparky too

* early return
2017-07-15 11:27:50 -04:00
ShizCalev
59ef81245b Changes some 1s and 0s to TRUE and FALSE (#29144) 2017-07-10 10:31:34 -04:00
Jordan Brown
3fb988c9c7 Swarmer cleanup 2017-06-28 11:05:49 -04:00
AnturK
0c3edf1ff7 Shuttle engines affecting travel time (#28564) 2017-06-25 22:52:06 -03:00
RandomMarine
bdd54531c8 Exporting mechs! (#28749)
* exporting mechs

* remove null

* do the thing the maintainer wants

* non-snowflek

* Minor thing
2017-06-25 12:34:09 -04:00
Nick
4140b5bc59 Centcom starts importing cat ears/tails (#28732)
* Update organs.dm

* Update organs.dm

* Update organs.dm

* Update organs.dm
2017-06-24 18:47:44 -04:00
nicbn
77a2d3f5cd Replaces "istype"s with is_helpers macros (#28676) 2017-06-22 15:03:19 -03:00
Jordan Brown
79cefc69d7 Merge pull request #28526 from RandomMarine/nothingmatters
Remember to test your PRs, kids! - Rebalances matter cartridge cost redux
2017-06-17 22:26:09 -04:00
Joan Lung
f07435337c Merge pull request #28435 from lzimann/typecaches
Changes a lot of is_type_in_list to use a typecache
2017-06-17 12:33:03 -04:00
RandomMarine
eac372fff8 Actually do what #22687 tried 2017-06-16 18:29:47 -07:00
Expletive
fe73e0e920 Gives the captain a somewhat robust golden fountain pen, and some others an average fountain pen. (#28382) 2017-06-16 22:12:10 -03:00
Lzimann
3b7fc1afc2 Changes a lot of is_type_in_list to use a typecache 2017-06-13 15:56:09 -03:00
TrustyGun
1db56a3d58 Clown Toy Box + Wooden Crates (#28227) 2017-06-09 13:01:51 -03:00
ShizCalev
f2d829261a [Typo] Duffel Bag (#28200) 2017-06-08 19:16:20 -03:00
Joan Lung
93bf75b576 Merge pull request #28178 from Expletive/detectivehair
Adds 91 new sprites for the Detective's Fedora and gives it some better booze.
2017-06-08 11:50:55 -04:00
Expletive
18807306a0 Fixes 28154: Accidental cargo exploit edition. (#28172) 2017-06-07 22:41:30 -03:00
Expletive
78473ac024 Resprite fedoras, Curator and Detective hats are now subtypes of fedora. All benefit from hair extensions 2017-06-07 09:03:19 -07:00
Expletive
8413960d8e A large and unasked for repath and improvement of accessories (formerly ties, but actually armbands and medals) (#28115) 2017-06-06 22:26:56 -03:00
Expletive
2b298bb6aa Adds The NT-75 Electromagnetic Power Inducer (#27653) 2017-05-31 14:59:13 -03:00
Joan Lung
ac4da32733 Splits mining_mobs.dm into separate files (#27773)
* Splits mining_mobs.dm into separate files

* find/replace
2017-05-29 02:16:26 -04:00
Lzimann
62b6e5bd27 Fixes a runtime with contraband crates 2017-05-26 23:22:15 -03:00
Pigeons
b1534b1ee8 Nerfs plasma cost 2017-05-23 14:28:17 -04:00
Leo
7d91e3143d Changes investigate logs to use a define (#27503) 2017-05-23 15:45:09 +12:00
Leo
17910dfe9c Merge pull request #27218 from Cruix/selltech
Fixed tech disk exports
2017-05-14 21:42:26 -03:00
coiax
7d84cb9ad8 Fixes engraved messages (#27186)
* Fixes engraved messages

🆑 coiax
fix: Curator soapstones now successfully leave messages for future
shifts.
del: Soapstones can no longer be purchased in cargo.
del: The janitor no longer starts with an empty soapstone.
experiment: Engraved messages can be left anywhere in the world, but be
wary that the terrain of places like lavaland and space can change shift
to shift.
/🆑

- Curators are now the sole owners of soapstones at shift start. This
means that a huge cargo point bounty shift will not overwhelm the
station with messages.
- Curators have an additional thing to curate.
- All the snowflake name bullshit is dumb, they're called soapstones,
they're plasma bluespace chisels, okay

* Fun messages for the log

* Log world

* Good to go
2017-05-14 21:50:16 +02:00
Ian Turk
fa4a54c43a Fixed not being able to sell research disks, and being able to re-sell disks by sending low-tech disks to reset the levels 2017-05-13 10:00:59 -06:00
Iamgoofball
448d3bc89e Balances Exports finally (#27099)
* Balances Exports finally

Exports have a basic sense of maximum amount, lowering by 1% in value for every sale, raising in 0.1% every 2 ticks up to it's max

* Update exports.dm

* Adds consistent marginal cost function (with decreasing marginal returns) and its associated antiderivative for total cost

* Tweaks get_cost procs and other properties in accordance with the new cost function

* Removes undefined vars causing errors

* Tweaks crates cost property

* I hate MINERAL_MATERIAL_AMOUNT AKA minor snowflake refactor

* Fixes price elasticity comments

* Changes var kelasticity to k_elasticity for better readablity

* Removes meme math obfuscation
2017-05-14 00:19:05 +12:00
ma44
9ef4e6a626 Update sheets.dm 2017-05-09 08:50:57 -05:00
QualityVan
76fc44167a Makes medbay vending machines buildable 2017-05-05 02:11:21 -04:00
KorPhaeron
b7864be38a Curator 2017-05-03 08:08:14 -04:00
Robustin
f90b87ae99 The least surprising nerf: Null Crates & Emagged Plasma Export Bonus (#26670)
* You knew this was coming

* No
2017-04-29 16:04:55 -06:00
Cyberboss
729010bbb2 Unorphans the blackbox (#26129)
Moved sql_poll_population from server_maint to this new SS. Moved few remaining server_maint tasks to SSping and deleted it.
2017-04-27 10:04:57 +12: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
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
Cyberboss
78ee754da3 Merge upstream 2017-04-01 23:38:37 -04:00