Commit Graph

19529 Commits

Author SHA1 Message Date
kevinz000
d4a6cdc0e8 Adds riding on other carbon mobs
rscadd: You can now ride piggyback on other human beings, as a human being! To do so they must grab you aggressively and you must climb on without outside assistance without being restrained or incapacitated in any manner. They must also not be restrained or incapacitated in any manner.
rscadd: If someone is riding on you and you want them to get off, disarm them to instantly floor them for a few seconds! It's pretty rude, though.
2017-02-19 10:39:35 +13:00
GunHog
347b384977 Aux Base Improvements (#24146)
* Aux Base Improvements

- The Base Management Console (BMC) may now set up its own landing zone
at random if mining has not prepared a drop zone.
- The BMC may now control the Perimeter Defense Turrets built by the
construction console. Their status and health may be checked from the
BMC as well.
- The PDTs now have slightly increased damage and fire through glass.
- Moved the BMC to its own file.
- Changed the path of the BMC in order to function properly as its own
computer type.
- The Aux Base's dock now doubles as a public mining shuttle dock once
the base is dropped and shuttle landing beacon set up. Controlled from
the BMC.
- Removed access requirements from the Box station mining shuttle to be
compabile with the public dock.
- Added a base construction console to Deltastation, moved the shuttle
beacon inside of the base, and moved a potted plant.

* Fix Maps

Fixes conflicts by redoing my previous edits

* Fix Maps again

Forgot to use the correct docking port, and remove access from one of
the Delta station mining shuttle doors

* Fix Pubby

My lack of experience with maps shows again!!

* 3/4 Suggested Changes

- Cleans up some code

* Final requested change

Href exploit prevention I guess?
2017-02-18 20:37:38 +01:00
Joan Lung
b600530d95 Merge pull request #24185 from XDTM/BSFIX
Fixes a R&D design.
2017-02-18 12:52:55 -05:00
TrustyGun
38419057b7 Advanced Mimery Kit (#23978)
d

🆑
add: Traitor mimes can now learn two new spells for 15 tc.
add: The first, Invisible Blockade, creates a 3x1 invisible wall.
add: The second, Finger Guns, allows them to shoot bullets out of their fingers.
/🆑

Traitor mimes can buy the Guide to Advanced Mimery for 15 tc. Invisible Blockade creates a 3x3 invisible wall around the mime, and Finger Guns allows Mimes to shoot bullets out of their fingers.

Invisible Blockade is 3x1 now to avoid this problem and still make Mimes be blocked by their own walls.
2017-02-19 00:49:40 +13:00
oranges
acbe49d279 Merge pull request #24139 from Cyberboss/Separation_of_church_and_state
Moves atom functionality from SSobj to SSatoms
2017-02-19 00:48:04 +13:00
anconfuzedrock
098caf7c9b adds slapping! (#24092)
* slap using disarm intent to the head against somebody with help intent
2017-02-17 23:58:51 -02:00
Joan Lung
118c7d155b Merge pull request #24129 from kevinz000/patch-63
Aimed projectile spell upgrades/refactor
2017-02-17 20:51:08 -05:00
XDTM
ee84022d37 CRYSTALS ARE MADE OF CRYSTAL 2017-02-18 00:46:33 +01:00
scoopscoop
514263f6c0 Tweaks condimaster layers (#24108)
* The condimasters on the eastern side of metastation should stop annoyingly ejecting their beakers behind themselves

* Actually this might be a better idea

* Defines!
2017-02-18 11:21:14 +13:00
Remie Richards
21ae56f34e Admin shortcut for converting ghosts to humans (#24157)
Used CtrlShiftClick as it's a largely (entirely?) unused combination, meaning it won't interfere with anything, but still act as a shortcut
2017-02-17 13:46:12 -06:00
PKPenguin321
8d87c435fc Adds bran requests (#24150)
* adds bran requests

* ahaha i english good
2017-02-18 01:10:21 +13:00
Cyberboss
b6d5aba7b2 Removes area.master. Moves area/New to Initialize (#24134)
* Removes master areas

* Ports area/New to Initialize
2017-02-18 01:04:47 +13:00
oranges
e0ee608ed6 Merge pull request #24138 from ChangelingRain/bubblegumfixtwo
Fixes infinite bubblegum charges
2017-02-18 01:04:26 +13:00
oranges
35dbb8610c Merge pull request #24052 from MrStonedOne/patch-310
Forces hardware rendering for all connecting clients.
2017-02-17 21:20:39 +13:00
oranges
538335130d Merge pull request #24133 from Cyberboss/patch-1
Fixes a warning caused by preloader not running
2017-02-17 21:19:43 +13:00
XDTM
ac1f378803 no s 2017-02-17 08:33:21 +01:00
XDTM
06e85b962e not that 2017-02-17 08:30:48 +01:00
XDTM
668c8b6bae Fixes a design 2017-02-17 08:30:22 +01:00
oranges
4349508853 Merge pull request #24128 from Cyberboss/JobTicker
Lobby timer won't be delayed by subsystem initializations
2017-02-17 14:34:12 +13:00
ExcessiveUseOfCobblestone
058115c3ad Rebalances flashes (#24111)
* New Old Era?

* DAY OF THE RO-FLASH

* Save the borgs

* OH NO I'M A MADMAN

* The Borg Fears The Flash...

* CAN I BE STOPPED?

* NO NOT THE FLASH
2017-02-17 14:28:20 +13:00
oranges
f1903e6f1e Merge pull request #24082 from swindly/chef_powercreep
Allows trays to put food in the processor
2017-02-17 14:19:40 +13:00
oranges
94802f48b3 Merge pull request #24075 from Cyberboss/DestroySleep
Adds logging for path that slept in Destroy
2017-02-17 14:14:37 +13:00
oranges
a01cba411f Merge pull request #24113 from Cyberboss/RobotRuntime
Fixes a robot camera runtime
2017-02-17 14:14:26 +13:00
bgobandit
b22e689417 Fixes some more goddamn typos and bad writing. (#24095)
* fixes some more goddamn typos

* ree

* ...

* seething hatred for typos

* wew
2017-02-17 14:10:58 +13:00
Thunder12345
5b07db6c06 Adds petting for real (#24062)
* Fixes petting

* Actually let's make the face thing his tombstone
2017-02-16 18:56:03 -06:00
coiax
dc87082fe1 Engraved messages UI and fixes (#23700)
* Engraved messages UI

🆑 coiax
add: Engraved messages now have a UI, which any player, living or dead
can access. See when the message was engraved, and like or dislike
accordingly.
add: Admins have additional options with the UI, seeing the player ckey,
original character name, and the ability to outright delete messages at
the press of a button.
/🆑

- If we were to move to a system where higher rated messages would be
more likely to be selected, this provides the ability to get those
ratings.
- Ratings are by ckey, so character independent.
- Authors cannot upvote or downvote their own messages.
- Did I mention that admins can just now delete the message, instead of
mucking around varediting them?

* Arrows > thumbs

* Brings back colours

* Readds message erasure

* Revert "Readds message erasure"

This reverts commit 92ef8e3f1672c0afd4d6cd630c329d6bf4689e77.

* Revert "Brings back colours"

This reverts commit 7a784e4e463398342c6ee5e18dc885f2a7cd46d0.
2017-02-17 09:54:30 +13:00
Joan Lung
98800badd0 Ocular Wardens will now target hostile-to-clockcultists simple animals (#24045)
* Ocular Wardens will now target hostile-to-clockcultists simple animals

* target it if it targets us
2017-02-17 09:51:56 +13:00
XDTM
6d1b976cbf Adds a bluespace crystal material, balances some R&D recipes around it. (#23984)
* Everything

* FAKE CRYSTALS

* make up your mind

* eat your bluespace, dear

* Reverts upload board cost, increases power of reaction_mob teleport
2017-02-17 09:50:49 +13:00
Remie Richards
d537bb17b2 Adds a soullink datum (#23869)
* Adds a soullink datum, used to tie one or more mobs together allowing actions that affect one to affect the other. Includes 3 examples.

* why isn't runtimestation the default anyway
2017-02-17 09:39:34 +13:00
Joan Lung
db94a3d83b His Grace is a better item and less globally-announced (#23951)
* His Grace is a better item and less globally-announced

* grace

* graceful

* tiny eyes!

* tiny eeeeyes

* less lethal

* You must have His Grace.

* You just need to compile His Grace.

* highly lethal grace

* ding ding ding you're super fucked

* rrr

* His Grace
2017-02-16 15:18:45 +01:00
kevinz000
9413f0855b [READY]Flightsuit Fix (#24026)
* Update flightsuit.dm

* Update flightsuit.dm

* Update flightsuit.dm

* forceful pulling

* woops

* working
2017-02-16 15:06:38 +01:00
Cyberboss
90ab5efeb7 Fixes @kevinz000's shit (#24110) 2017-02-16 15:02:30 +01:00
Cyberboss
3c9d1ff235 Fixes spawners running in nullspace (#24109) 2017-02-15 22:48:40 -06:00
coiax
1afcc031e9 Main CTF gun disappears when dropped on the floor (#24087)
🆑 coiax
fix: The main CTF laser gun disappears when dropped on the floor.
/🆑

Brings it in line with all the other ammo and guns, I wanted the only
source of ammo to be the deathdrop ammo pickups. Also, it prevents the
red team from shooting blue team's guns.
2017-02-15 22:46:48 -06:00
Steelpoint
46fae8ed6c Security Internal Jetpack (#23898)
* InitialCommit

* SecurityJetpack

* MoveToSuitStorage

* MergeConflict

* LeftAndRightInHands

* MergeConflict2

* InternalJetpack

* MergeConflicts3

* MergeConflict4

* MergeConflict5
2017-02-15 22:43:06 -06:00
Cyberboss
9050485817 Moves atom functionality from SSobj to SSatoms 2017-02-15 12:35:55 -05:00
Joan Lung
fd53424acd Fixes infinite bubblegum charges 2017-02-15 12:35:19 -05:00
Cyberboss
ccc3328935 Fixes a warning caused preloader not running 2017-02-15 09:10:13 -05:00
kevinz000
22976bf48f Fixes server-crashing issue. (#24054)
* Update special.dm

* Update special.dm

* Update special.dm
2017-02-15 11:51:02 +01:00
kevinz000
57b16b9dac Update aimed.dm 2017-02-15 02:18:14 -08:00
Joan Lung
ca6cd13145 Fixes bubblegum (#24121) 2017-02-15 00:36:55 -06:00
Cyberboss
17bc8038f1 Roundstart no longer delayed by initializations 2017-02-14 23:47:01 -05:00
Cheridan
2e7c491d67 Merge pull request #24016 from MrPerson/wavedashing_is_a_legitimate_tactic_in_the_tournament_ss13_scene
Kills wavedashing and tactical resting
2017-02-14 21:40:13 -06:00
oranges
f3f5b44e20 Merge pull request #24064 from KorPhaeron/eyes4
Fixes alien eye toggle
2017-02-15 15:55:42 +13:00
oranges
2cfd92f764 Merge pull request #24077 from Cyberboss/DestroyTurfsAgain
Cleans up ChangeTurf/Destroy
2017-02-15 15:55:04 +13:00
oranges
7fecc3c11a Merge pull request #24068 from Cyberboss/GGQDEL
Fixes gravity generator qdel loop
2017-02-15 15:52:18 +13:00
oranges
5246476689 Merge pull request #24069 from Cyberboss/HolodeckAreaFix
Fixes runtime/GC errors with holodeck computer areas
2017-02-15 15:52:02 +13:00
oranges
bf6c90546c Merge pull request #24074 from Cyberboss/FUCK-EVERY-PIRATE
Fixes pirate shooting runtimes
2017-02-15 15:51:46 +13:00
Cheridan
b3736d8954 Merge pull request #24088 from kevinz000/patch-60
updates check antag player counting to show brains instead of letting them cause errors
2017-02-14 20:48:46 -06:00
Cheridan
97a91274ad Merge pull request #24046 from PKPenguin321/patch-8
updates some stuff to log better
2017-02-14 14:20:40 -06:00