Commit Graph

12118 Commits

Author SHA1 Message Date
Kyep
3df13bac0d Fixes CC jobs being selected for antag roles (#4815) 2016-06-29 08:32:04 -04:00
Tastyfish
cc1f984136 Fixes a bunch of to_chat runtimes (#4817)
* Fixes a bunch of to_chat runtimes

* also that one
2016-06-29 08:31:27 -04:00
Ronald T. Mullins III
7e9ff08ceb bandolier_fix2 (#4807)
* bandolier_fix2

I'm dumb. Bandolier should update_icon with New()

* Update belt.dm
2016-06-28 23:44:30 -04:00
Tastyfish
240376c4df Fixes beach edge overlay being pullable 2016-06-28 16:58:23 -04:00
Norgad
7e06d5a590 Extends Incinerator Maintenance - 'No gross commits everywhere' Edition (#4774)
* Moved everything over

its fine

* does that

it does

* fixed doors

ssssssssssssssssss
2016-06-28 15:49:31 -04:00
Krausus
8d7e638f6e Improved to_chat debug message (#4795)
Also fixed a couple related, minor bugs
2016-06-28 11:34:54 -04:00
monster860
4bf28bdc33 Wormhole gun fixes and changes (#4792)
* Wormhole gun fixes and changes

* icon_state

* Revert lack of decay chance
2016-06-28 11:33:26 -04:00
Kyep
3183192c27 Tigercat, Tigercat, does whatever a Tigercat does 2016-06-27 22:05:37 -07:00
Tigercat2000
82091296bd Merge remote-tracking branch 'upstream/master' into bay_equipping
Conflicts:
	code/game/objects/structures/crates_lockers/closets/wardrobe.dm
	code/modules/client/preference/preferences.dm
	code/modules/client/preference/preferences_toggles.dm
2016-06-27 08:20:49 -07:00
Kyep
a46c066aec Krausus 2016-06-26 18:05:13 -07:00
TheDZD
b54b3a8fb2 Merge pull request #4775 from Fox-McCloud/mutate-fix
Wizard Mutate Spell Fix
2016-06-26 14:58:54 -04:00
Kyep
d28cb5e8bc Allows admins to save their CC characters (#4717)
* Initial Checkin

- Creates two new admin-only jobs, "Nanotrasen Navy Officer", and
"Special Operations Officer". The former is for IC investigations by
admins of situations on the Cyberiad, and spawns in the admin room. The
latter is for leading/overwatching ERT teams, and spawns at the ERT
office.
- Neither of these jobs are accessible to normal players, either on
join, in preferences, or as a random job.
- When they are spawned, no announcement is made, and they do not show
up on the crew manifest.
- In other news, the "select equipment" debug verb has also been
adjusted so that NT Navy Officers get the same equipment either way.

* Fixes teleporter on admin station so that admins can use it to teleport directly to bridge

* Fixes CC jobs not always displaying CC HUD icon for sechuds

* Adds an implant that dusts someone on their death

* Tweaks

Changes:
- CC officers now spawn with an internals box in their backpacks, like
everyone else.
- CC officers now get dust and death alarm implanters in their backpacks
on spawn, rather than automatically having the implants in their bodies.
This enables admins to test things on admin station without worrying
about dusting or having their deaths broadcast.
- Dust implants no longer provide death alarm functionality.
- Dust implants no longer process().
- Dust implants are now based on explosive implants, and can be manually
activated via deathgasp.
- CC officers now spawn with CC headsets that are named 'centcom
headset'.

* Deletes CC encryption key

* Switches to using imp_in.dust()
2016-06-26 13:57:59 -04:00
Kyep
7a8480b1a5 more text changes 2016-06-25 18:59:10 -07:00
Kyep
4b208193e8 Deletes parole jumpsuits 2016-06-25 07:50:06 -07:00
Crazylemon64
c0f5cedf41 Adds a system to give each ruin a separate area
- This means separate APCs and air alarms, while still sharing the same
"Space" area, or any other area that isn't a ruin subtype
2016-06-25 01:44:08 -07:00
Kyep
55d0472268 Initial checkin 2016-06-25 00:35:00 -07:00
Crazylemon64
0f438db4f6 Now with 100% less catastrophic atmospherics failure 2016-06-25 00:25:13 -07:00
Kyep
8a610e5a84 Fixes
- Fox Fixes.
- Clear messages when emagged or EMPed.
- Parole suit can no longer be locked on people with sec or head access.
2016-06-24 23:55:08 -07:00
Fox-McCloud
c6117cfa5a Wizard Mutate Spell Fix 2016-06-25 02:46:17 -04:00
TheDZD
7b7c1395bc Merge pull request #4768 from Krausus/InvestigateFix
Investigation Log and to_chat Fixes
2016-06-24 19:45:08 -04:00
Crazylemon64
dd98f1c868 Merge remote-tracking branch 'Krausus/InvestigateFix' into space_ruins
@tigercat2000 is a butt
2016-06-24 16:42:47 -07:00
Crazylemon64
a4fde648e7 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into space_ruins 2016-06-24 16:03:10 -07:00
Krausus
eecf8ba93b to_chat fixes
Mostly sounds using to_chat instead of << like they should. Also, the
to_chat CRASH now refers to itself as to_chat instead of Boutput.
2016-06-24 18:36:50 -04:00
LittleBigKid2000
a271149a06 Fixes the contract and blood bottle only refunding for 1 point (#4770)
The apprenticeship contract and blood bottle cost 2 points, but you only
get 1 point when feeding them back into your spellbook.
2016-06-24 18:30:30 -04:00
Krausus
9095f2ebe1 Fixes Investigation Logs and Runtimes
- Fixes investigation logs showing various unused subjects instead of
the ones actually in use
- Fixes runtime when trying to investigate-log
- Fixes runtime when playing the station's "welcome" sound
2016-06-24 12:30:49 -04:00
Aurorablade
b93fef2369 snek? snek?! SNEEEKEKKKKKK!!!!! (#4759)
* snek? snek?! SNEEEKEKKKKKK!!!!!

* PLANT ops
2016-06-24 11:30:54 -04:00
LittleBigKid2000
9df0329088 Fixes candy corn not having an icon (#4765) 2016-06-24 09:30:27 -04:00
TheDZD
c626530c5e Merge pull request #4638 from monster860/rcd-ui
Gives RCD a UI, and the ability to select airlock type and access
2016-06-24 08:53:49 -04:00
TheDZD
7c602b5e54 Merge pull request #4743 from FalseIncarnate/bug_fix
Stool-fu
2016-06-24 08:32:07 -04:00
Kyep
aa55eed211 Initial checkin
- Improved tracking implants
- Added parole implant (chem implant with ether)
- Added parole jumpsuit + control wand
- Added box of the above to warden's locker
2016-06-24 01:22:53 -07:00
FalseIncarnate
42e624cb39 4 character commit
really.
2016-06-23 21:09:08 -04:00
monster860
677ba508a7 Forgot a thing 2016-06-23 20:03:26 -04:00
monster860
c048af99f0 Access restrictions on RCD door access changing 2016-06-23 20:01:29 -04:00
monster860
e510106a85 Merge branch 'master' into vg-parallax 2016-06-23 19:19:32 -04:00
taukausanake
c995cc036e I don't want Tiger to bite my head off 2016-06-23 17:14:05 -05:00
tigercat2000
732c3b4ae5 Goonchat (#4744)
* bicon regex run

* Remove all \black

* Goonchat from /vg/ / Goon

Whoo!
Special thanks to @Tastyfish for the macro2html thing so all of our
horrible color macros keep working and don't fail horribly <3

* Fixes and changes n stuff

- Made ping sane again (the fuck PJ)
- Updated chat CSS
- Fixed like one problem with a color macro

* whoops

* Restore /vg/'s pingloop stuff (used to avoid fucking up is_afk)

* Strip problematic tags from tcomm scripts

- <audio>
- <video>
- <iframe>
- <script>

* Fix human examine icon

* Name hotkey elements

* Removed old stylesheet
2016-06-23 16:56:15 -04:00
taukausanake
35457bd80c Forgot to remove bee HUD
Yeah, can't do this so removing it. Maybe I'll revisit it once I can muster enough thought processing on it
2016-06-22 23:20:50 -05:00
taukausanake
4b274dd00f This should be it
Removed special check for plants. Bees undo it all so it's not worth the trouble just yet.
Credit for Crazylemon for being best coder. He helped me find a lot of issues that I would have been too stupid to find myself. Runtimes are gone
2016-06-22 23:03:09 -05:00
TheDZD
5e2d7920c7 Merge pull request #4713 from DaveTheHeadcrab/engineer_workboots
Engineer Workboots
2016-06-22 14:03:04 -04:00
taukausanake
5f129c5ba4 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into plant_hud 2016-06-21 18:21:31 -05:00
FalseIncarnate
fef4ae6c0c Stool-fu
Stools can once again be picked up during impromptu bar brawls. Show
them who the real tough-guy is!

🆑
bugfix: To save on adhesive costs, Nanotrasen has stopped gluing stools
to the floor. The resulting bodily injuries probably won't cost more.
/🆑
2016-06-21 19:09:16 -04:00
Mieszko Jędrzejczak
876ab1cdd8 Makes the medical HUD overlay smoother (#4726)
* Smoother medical hud

* Port's /tg/'s neat flashy thingies.
2016-06-21 16:56:31 -04:00
VampyrBytes
8af56d111c Makes jump actually jump (#4735)
* Makes jump actually jump

fixes #4707
sets flying to 1 for the duration of the jump. Means you can jump over
anything you can fly over.

Also fixes a bug with flying that could leave you visually floating
(pixel_y = 5) when you stop flying

* better fix
2016-06-21 16:56:11 -04:00
Tastyfish
e3d8623a4e Makes cryo tube, sleeper, and body scanner eject dropped items (#4738) 2016-06-21 16:55:15 -04:00
TheDZD
eb7b4af916 Merge pull request #4730 from Kyep/beefix
Fixes Bee Briefcase killing traitors regularly
2016-06-21 15:54:31 -04:00
monster860
120e470458 Ports /vg/ parallax 2016-06-21 14:58:49 -04:00
Kyep
c9240f216e Changed to DZD's suggestion 2016-06-20 22:17:17 -07:00
taukausanake
3dd3dabe24 Final push
unless someone says no. Everything should be good however I noticed some runtimes with the nutrient and water HUDs. Maybe some floating point problems but those two shouldn't do decimal values. Otherwise the only other issue I can thing is that the HUDs don't update immediately every time.They still update when they should but I've noticed some irregularities...
2016-06-20 23:49:07 -05:00
taukausanake
795271048d Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into plant_hud 2016-06-20 11:23:28 -05:00
taukausanake
55326e1c70 Technical difficulties
Decided to scrap the beekeeping HUD for now. Turned out it's way more complicated that I thought. I'll try it again in the future.
Added the Hydro HUD design for Protolathe. Need to test if it works.
Might have made a mistake in Git so commiting in order to pull from Paradise master to see if anything broke.
2016-06-20 11:20:32 -05:00