Commit Graph

19899 Commits

Author SHA1 Message Date
Lombardo Paredes a01eda01e1 Add handicons for the winter coats (#25261)
* Add handicons for the winter coats

Redid the PR because merge conflicts.

* Add item_states
2017-03-18 21:30:03 -04:00
Lexorion 76dbaea8dc Gives the swat mask unique inhands (#25255) 2017-03-18 19:32:26 -04:00
Lombardo Paredes 63293d60f5 Add inhand icons for security winter coat (#25245)
Add inhand icons for security winter coat
2017-03-18 15:49:28 -04:00
WJohn 821202b936 Merge pull request #25195 from uraniummeltdown/plantdisk
New Plant Data Disk Sprite
2017-03-18 14:11:57 -04:00
AnturK d61dc54d17 Abductor fixups (#25210) 2017-03-18 14:44:10 -03:00
Cyberboss 3889d0372d Fix event cancellation (#25200)
* Fix event cancellation

* CANT
2017-03-18 18:15:10 +01:00
KorPhaeron 20b65bb29f Fixes aliens hitting themselves with their own projectiles (#25197) 2017-03-18 18:14:03 +01:00
Lexorion f35b8cd8a9 Gives the sechailer unique inhands (#25232) 2017-03-18 11:28:50 -04:00
Jordie b3dd0479ce Merge pull request #25191 from lzimann/shadowpeople
Fixes wrong organ slot for eyes on species gain
2017-03-19 01:55:10 +11:00
MrPerson 2394b4ce7c More lighting fixes for white space and black tiles (#25229)
* More lighting fixes for white space and black tiles
2017-03-18 09:42:50 -03:00
XDTM 6f184513a0 Runic golems (#25028) 2017-03-18 08:04:47 -03:00
Cyberboss 6e744de10c Adds a way for admins to keep the arrivals shuttle docked permanently (#25136) 2017-03-18 08:02:09 -03:00
Leo 6845cab264 Merge pull request #25189 from Supermichael777/golem2
Adds an id card to the free golem ship vendor
2017-03-17 23:25:10 -03:00
Cheridan 44b6e31725 Merge pull request #25181 from lzimann/orm
Refactors ORM code
2017-03-17 17:28:42 -05:00
Cheridan 544b41e1e5 Merge pull request #25180 from ExcessiveUseOfCobblestone/penoriented
THIS STUPID PEN PR FINALLY IS FINISHED GAH
2017-03-17 17:04:53 -05:00
Cheridan 3d36848cd3 Merge pull request #25170 from AnturK/adjacenttohell
Fixes adjacency
2017-03-17 14:33:41 -05:00
Remie Richards 0b6d5fc6df Dynamic hair! (#25114)
* Dynamic hair!
2017-03-17 16:05:02 -03:00
Lzimann cb4b9a91c6 Requests console now have a receive ore updates variable.
Also updates all maps with it.
2017-03-17 15:04:00 -03:00
Cyberboss 3c9b0b152b Refactors statclick a bit (#25102) 2017-03-17 13:29:25 -03:00
Cyberboss 0bb7407503 Adds a configuration option for disabling preferred maps (#25137)
* Adds a config option to disable map voting
2017-03-17 12:50:26 -03:00
Joan Lung 58216c4189 Merge pull request #25192 from MrPerson/no_more_reverts_this_pull_request_has_a_family
Fixes non-dynamically lit areas being pitch black
2017-03-17 11:07:15 -04:00
Xhuis 764ec63713 Adds the power flow control console (#25001)
* Adds the power flow control console

* Minor cleanup

* Adds some new stuff

* Tweaks sounds

* Added access requirements, admin logging, AI restriction

* Part 1: Remove dem consoles

* Put dem consoles back

* Small patch

* Some work I can't remember

* Sanity checkin'

* Maybe now!

* Sanity checks pass 3295912

* Sanity checks
2017-03-17 15:57:56 +01:00
uraniummeltdown 2ba2dd5d1d plant data disks use new sprite from baystation 2017-03-17 16:22:24 +04:00
MrPerson b71e89ce10 Fixes non-dynamically lit areas being pitch black
Fixes #25179 (Legitimate closing of a pull request, thanks for this bug github)
Fixes #25164
2017-03-16 21:30:06 -07:00
Lzimann df6647db1a Fixes wrong organ slot for eyes on species gain 2017-03-17 01:20:15 -03:00
Leo 7b2b19f1f8 Merge pull request #25152 from optimumtact/youhavedonetheworldalittlebitmoresad
Modifies admin message on href spam
2017-03-17 00:28:58 -03:00
Iamgoofball 099c822b7c RCD refactor (#25154)
* Refactors RCD code
2017-03-17 00:22:22 -03:00
Cyberboss c09d61ae79 Runtime station fixes (#25151)
* Fixes spawning on runtimestation titlescreen

* Fix shuttle runtimes
2017-03-17 00:07:34 -03:00
Supermichael777 b533abe073 Adds an id card to the free golem ship 2017-03-16 21:43:45 -04:00
Leo 387b44d4be Href logs now use time_stamp() so it properly logs the seconds aswell (#25153)
* Href logs now use time_stamp() so it properly logs the seconds aswell

* Updates time_stamp to show decisseconds

* Href logs now display decisseconds
2017-03-17 14:15:39 +13:00
Joan Lung 5917e1ffae You can now place lights on shuttles (#25142)
* You can now place lights on shuttles

* apcs don't go there

* this should really be a proper decon
2017-03-16 19:18:25 -05:00
Lzimann cdd8843d49 Refactors ORM code 2017-03-16 19:24:27 -03:00
ExcessiveUseOfCobblestone 7b34c5e20f AFTER A MILLENIA 2017-03-16 18:15:33 -04:00
Kyle Spier-Swenson c74f961abc Fixes lighting not updating opacity on atom delete (#25139) 2017-03-16 22:28:39 +01:00
Cyberboss b639f0c99e Fixes admin latejoin disabling (#25041)
* Fixes admin latejoin disabling

* Fix alerts
2017-03-16 17:06:52 -04:00
AnturK 530996a171 Fixes adjacency. 2017-03-16 18:33:21 +01:00
Jordie 127d1f6daf Combines legacy_population and sanitizes death queries (#24914)
* combines admin and player pop count and sanitizes death queries

* renames proc

* removes proc call to sql_poll_admins

* add tox- clone- and staminaloss to death table

* adds ip and port to legacy_population

* null ip and cid handling for bans

* sans colons
2017-03-16 13:01:52 +01:00
peoplearestrange 7d2b95759a Buildmode full title window path fix (#25125)
Full tile windows built from Buildmode Basic were pointed at an old path. Changes this to match the new one.
🆑 
fix: Fixed buildmodes full tile window to be correct path
/🆑
2017-03-16 20:25:04 +13:00
kevinz000 3156b3c5e6 [READY]More SDQL stuff from /vg/ (#24970)
* sdql3

* wups
2017-03-16 20:24:10 +13:00
oranges da82337c64 Merge pull request #25048 from kevinz000/patch-89
makes admin player counter ignore drones
2017-03-16 20:21:12 +13:00
Cyberboss a09e76285d Fixes the slow leak in arrivals (#25074)
* Fixes the slow leak in arrivals

* ree src
2017-03-16 20:19:37 +13:00
Militaires 0e67b7ad0c new speedwagon sprites: car now runs people down easier (#24961)
* new sprite and """hitbox"""

* new overlay glass cover

* fixes offsets for new speeduwagon sprites

* rogue white line and steering wheel

* MISSING pxl
2017-03-16 20:15:51 +13:00
Cyberboss 31001c3493 Removes the in transit requirement from spawning (#25160)
* Removes the in transit requirement from spawning

* Remove commented out line
2017-03-16 17:39:41 +13:00
oranges 3e38e06e56 Admins can now follow href spammers 2017-03-16 01:54:25 +00:00
MrPerson db34a1f2be Merge branch 'master' of https://github.com/tgstation/-tg-station into revert_revert_revert_come_on_revert_please_rever_please_shit_REVERT_JESUS_TAPDANCING_CHRIST_REVERT_YOU_FUCKING_PIECE_OF_GODDAMN_PISS
Conflicts:
	code/_onclick/hud/plane_master.dm
	code/modules/lighting/lighting_object.dm
2017-03-15 18:53:09 -07:00
Leo 4a5cf0ce7d Messages(notes, watchlists, messages) are now sorted by descending instead (#25080)
* Messages(notes, watchlists, messages) are now sorted by the time descending instead of ascending

* Changes so only notes have desc ordering instead of memos and watchlist enties

* how did this even happen
2017-03-16 09:34:29 +11:00
oranges 9aaff6e281 Fixes sinks giving misleading messages when containers full (#25037)
* Sinks will now give a message when the reagent holder is full

This also adds a helpful proc to check a reagent holder is full

* It was one character
2017-03-15 16:38:33 -04:00
oranges e616aa0c19 Merge pull request #25056 from Cyberboss/patch-18
Moves when macros are substituted in the loader
2017-03-16 09:32:47 +13:00
Tokiko1 bf85ff2327 Adds new gas interactions to supermatter, new minor and major failures and rebalances (#24785)
* Adds new gas interactions to supermatter.
Adds new minor and major failures to supermatter.
Adds highpressure windows to box.

* Shard now announces critical power and critical mass.

* Balance adjustments, some test stuff.

* Higher mole hot setups now scale in damage because they are harder to heat. Low mole setups, like the roundstart shard now cause less damage because they heat up smaller amounts of gas faster.

Actually made windows heat resistant now.

The supermatter crystal now takes damage from heat much earlier.

* Testing and tweaking more stuff.
Added tesla_zap proc.
Added anomaly generation.
Added occasional gravity pull in.

* Fixes anomaly spawner, hopefully fixes lightning bolts.

* Fixes supermatter lightning. Tweaks and balances some more values.

* Resolves conflicts for real now.

* Adds high pressure windows to the supermatter in box, meta and delta.
Fixed supermatter shutter button requiring atmos id on box and meta.
Readded the missing electrical supplies and welding locker to engineering of metastation.
Fixed stuff for travis.

* More balancing and behaviour changes.

* Adds heat_resistance to windows so windows can now survive more than TOC+1600 K if desired.
Also makes high pressure windows able to withstand 50000° K.

* More overcharge tweaks.

* Makes stuff compile and removes extra whitespaces.

* Even more tweaks.

* Rebalances power increase from matter, removes mass paper radiation exploits. Nerfs plasma. Removes mapchanges for the time being.

* Adds high pressure windows to the supermatter engine in box, meta and delta.

* Merge conflicts.

* Requested changes.

* Fixes supermatter zap overriding src.

* Fixes message timing.
2017-03-15 16:23:56 -04:00
Cyberboss ae82cd1bc3 Fix runtimes with preview dummies (#25065)
* Fix runtimes with preview dummies

* Ree
2017-03-15 14:13:34 +01:00