Commit Graph

23839 Commits

Author SHA1 Message Date
Jordan Brown
eb083410c9 Merge pull request #34509 from Iamgoofball/patch-365
Super Surplus Crate
2018-01-17 08:27:54 -05:00
Jordan Brown
45048cbaf2 Merge pull request #34507 from AutomaticFrenzy/patch/sdql-jmp
Add JMP buttons to SDQL select results
2018-01-16 22:41:24 -05:00
Jack Edge
19c214514e Ghosts can start CTF on their own
🆑 coiax
add: If enough people vote to start CTF (by clicking on a CTF controller
as a ghost), then CTF will automatically begin.
/🆑

- CTF will no longer restart 30 seconds after it ends, it requires
people to vote for it.
- Victory messages are coloured with the team's colour.
- Current number of people required to start CTF is 4 people.
2018-01-16 19:21:25 -06:00
arsserpentarium
d35f3da470 [READY]Circuitry lab (#34493)
* spelling

* base

* maps

* merge

* firealarm

* floor

* floor again

* if you insist...

* DV

* DV(2)

* DV(3)

* fuck

* fuck

* apc

* boxapc
2018-01-16 17:44:26 -05:00
oranges
387e09c08f Merge pull request #34319 from ShizCalev/travis-maps
Fails travis on common mapping mistakes
2018-01-17 09:36:15 +13:00
oranges
073744fb19 Merge pull request #34322 from coiax/no-longer-harvested
Removes ash flora being harvested on roundstart
2018-01-17 09:35:23 +13:00
oranges
7fe928d11a Merge pull request #34468 from ShizCalev/redundant-trim
Cleans up some redundant stripped_input usage
2018-01-17 09:32:00 +13:00
kevinz000
6ebc926f00 Fixes lavaboat buckling (#34450)
* Buckle order

* lavaboats
2018-01-17 09:30:14 +13:00
oranges
30dfc429dd Merge pull request #34473 from kevinz000/techwebs_points
Nerfs techweb cargo points
2018-01-17 09:29:25 +13:00
oranges
6cfede150c Merge pull request #34457 from AutomaticFrenzy/patch/air-status
Combine and fix Show Air Status and Air Status in Location
2018-01-17 09:28:52 +13:00
oranges
31217df709 Merge pull request #34470 from Cyberboss/MoveMotd
Moves load_motd to config controller
2018-01-17 09:27:35 +13:00
F-OS
b0b74b6d97 Drone dispensers no longer trap the drones below them forcing ghosts to altclick (#34482)
* Update drones_as_items.dm

* Update drones_as_items.dm

* Update drones_as_items.dm

* Update drones_as_items.dm

* I've got PRs to close, no time to wait on you
2018-01-16 09:44:53 -05:00
Jordan Brown
fe0610f504 Merge pull request #34505 from AutomaticFrenzy/patch/camera-failure-crash
Fix Camera Failure crashing the server if there are no cameras
2018-01-16 09:38:56 -05:00
kevinz000
df559566cb Refactors how flashes get targets and whatnot, so they no longer work from inside containers to outside. (#34171)
* Flash Refactor

* Update flash.dm

* Update flash.dm
2018-01-16 15:30:03 +01:00
Jordan Brown
e300843c44 Merge pull request #34479 from F-OS/patch-5
newly built air alarms now start unlocked too, this isn't powercreep this is quality of life
2018-01-16 09:29:12 -05:00
Jordan Brown
f1e7a3d070 Merge pull request #34455 from kevinz000/patch-435
Fixes shuttle console negative auths needed
2018-01-16 08:39:31 -05:00
Jordan Brown
a3d3c93fa3 Merge pull request #34463 from DaedalusGame/micro_fix
Fixes duplicate reagents in chemistry macros
2018-01-16 08:39:06 -05:00
Jordan Brown
683402c5f7 Merge pull request #34460 from AnturK/whyijustwastedhalfanhourlookingforatypo
Fixes ChangeTurf runtimes in late loaded templates.
2018-01-16 08:38:27 -05:00
AnturK
332e7ca474 Makes getFlatIcon slower. (Also more precise) (#34199)
* getFlatIcon fixes and improvements. DO NOT TOUCH

* Fixes area blendings

* Stuff

* Drops the named arg
2018-01-16 08:32:35 -05:00
Iamgoofball
fc1bd6c8cc Super Surplus Crate
Idea stolen from leddit
🆑 Iamgoofball, Anuvkh from Reddit
experimental: Super Surplus Crates are now available for 40 TC. They come with 125TC of shit. Have fun with teamwork!
/🆑
2018-01-15 21:55:47 -08:00
Tad Hardesty
b3b3b38f34 Add JMP buttons to SDQL select results 2018-01-15 21:40:16 -08:00
Tad Hardesty
66f5459e88 Fix Camera Failure crashing the server if there are no cameras 2018-01-15 21:12:06 -08:00
uraniummeltdown
8d5030f3a7 rename all 'clown' to 'bananium' for bananium mineral objects (#34462) 2018-01-15 23:02:18 -05:00
Tad Hardesty
5c85f18580 Combine and fix Show Air Status and Air Status in Location 2018-01-15 16:53:07 -08:00
XDTM
76b5ee3966 Xenobiology Species Rework (#34166)
I've always found grating that xenobiology had access to species they had no business working with, and slime magic can only explain so much. My idea is to separate those species into their respective departments/antags, instead of having them all into a centralized, cheap source.

    Androids should be made by robotics through augmentation
    Podpeople are a botany feature
    Skeletons should be limited to liches or other magic antags
    Zombies should stay limited to romerol
    Golems are still available in adamantine slimes (and luminescents can morph into golems with them)
    Shadowpeople still lack an official place, but luminescents can become shadowpeople with black cores

The basic races are mostly human and lizard, and there are mutation toxins for those in case someone wants their species back after bodyswapping/ling mutation sting/etc.
2018-01-16 11:07:06 +13:00
oranges
4e53bf5337 Merge pull request #34266 from KorPhaeron/goat
Goats eat plant people
2018-01-16 10:54:20 +13:00
F-OS
4d1cb3d01e we're reaching power creep levels that shouldn't even be possible 2018-01-15 12:24:02 -07:00
F-OS
75e1d31589 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>FIRE ALARM 2018-01-15 12:22:39 -07:00
AnturK
5872df6499 Fixes hardsuits in templates 2018-01-15 12:35:45 -06:00
kevinz000
a29994cbb1 Fixes Jaunters 2018-01-15 12:04:57 -06:00
kevinz000
4c527afda8 Nerfs techweb cargo points 2018-01-15 09:25:15 -08:00
Cyberboss
6fe468e3b4 Moves load_motd to config controller 2018-01-15 10:44:25 -05:00
Kyle Spier-Swenson
5bceb36588 Fixes compiler errors in the preload_rsc external resource thingy (#34061)
Fixes compiler errors in the preload_rsc external resource thingy
2018-01-15 10:32:20 -05:00
ShizCalev
18c0928903 Redundant params 2018-01-15 10:22:58 -05:00
Emmett Gaines
867a58d576 makes the lavaland mining base have more correct baseturfs (#34325) 2018-01-15 09:42:14 -05:00
coiax
b288a4ae12 Xenomorph maids (and Barmaids) clean on move (#34354)
🆑 coiax
add: A xenomorph maid (or barmaid) cleans the floor as they walk on it.
Lie down, and they'll clean your face.
/🆑

- Clearly a massive xenobiology buff by letting them create simple mob
janitors.
- Actually implemented so the Barmaid can clean up the Emergency Escape
Bar, but sure, let's buff the regular maid as well.
2018-01-15 15:01:06 +01:00
WJohn
fec56e4923 Remakes the space syndicate listening post. (#34309)
* Remakes the space syndicate listening post. TGM in a second.

* TGM of the map

* Removes space suit from EVA.

* Removes bed and dirty var.
2018-01-15 14:17:04 +01:00
BordListian
a196791f90 - Fixes duplicate reagents in chemistry macros 2018-01-15 13:39:15 +01:00
AnturK
8c514c1e82 Fixes ChangeTurf runtimes in late loaded templates. 2018-01-15 10:16:47 +01:00
ShizCalev
42df595372 Fixes missing pipe colors in RPD and pipe painter (#34371) 2018-01-15 10:01:22 +01:00
coiax
978c2bd485 Various deadchat messages are more informative and consistent (#34326)
More deadchat messages now follow the following format.

> George Mellons has done a thing at AreaName.

- Shuttle calling
- Shuttle recalling
- Security level changing
- Maintenance accessing
- Swiping for red,emergency maint, bsa
- Messenging centcom, syndicate

Fixes #34230.
Fixes #34231.
2018-01-15 09:55:54 +01:00
Iamgoofball
3dde1d253c The Express Console emag effect is now a proper emag effect (#34373)
* The Express Console emag effect is now a proper emag effect

cyka blyat

* Update expressconsole.dm

* Update expressconsole.dm

* Update expressconsole.dm

* Update expressconsole.dm

* Update expressconsole.dm

* Update expressconsole.dm

* Update expressconsole.dm

* Update expressconsole.dm
2018-01-15 00:48:34 -05:00
kevinz000
34e134bd38 Fixes negative auth coutns 2018-01-14 20:53:27 -08:00
John Ginnane
2587222509 Fixed alt-click not working with stacks (#34396)
* Can disable auto-merge

New argument which lets you stop stacks from automatically merging when picking them up

* Fix 0 stacks

* Updated simple_animal/put_in_hands()
2018-01-14 23:04:18 -05:00
Tlaltecuhtli
529b794580 Fixes eating mouse grammar (#34395) 2018-01-14 23:01:30 -05:00
Leo
1572607f65 Merge pull request #34372 from YPOQ/slimestopfix
Fixes players not being immune to their own slime timestops
2018-01-15 01:35:39 -02:00
Leo
dd109af292 Merge pull request #34384 from F-OS/patch-3
Quality of life: Newly constructed APCS are unlocked
2018-01-15 01:32:08 -02:00
oranges
723a183214 Merge pull request #34246 from Cruix/roundend_tooltips
Added tooltips to roundend traitor purchase logs
2018-01-15 11:42:40 +13:00
Tlaltecuhtli
8e2d8fd9fe sfds (#34392) 2018-01-14 16:41:42 -05:00
Emmett Gaines
d040afd6d0 Moves GLOB.movement_keys into SSinput and adds movement direction badminry (#34123)
* badmin flip dirs

* moves movement_keys into SSinput from GLOB
2018-01-14 20:37:59 +01:00