Commit Graph

994 Commits

Author SHA1 Message Date
Joan Lung
e83d72219d Soft crit, except not terrible (#30262)
* Soft crit, except a little bit harder.

* tweak

* 👌

* why was this even in here

* no radios in critical

* fix that too

* keep to original logic

* not very smart, really

* tip: do nothing tgui-side that you can do code-side, because we can't do defines in tgui

* blood trail

* can't do blood trails

* how does this even work

* harsher slowdown and more obscured vision

* it really puts it into perspective; you're fucking dying.

* stat_attack

* stop fuckin whispering into radios or whatever it is you're doing

* more fixes

* fix

* fix

* fix the radio shit

* bikeshed?
2017-09-04 18:58:34 -05:00
AnturK
99a421491f Fixes BYOS (#30356)
* Fixes BYOS

* Uses defines on dock checks.
2017-09-03 11:46:11 -03:00
Jordan Brown
5b40e30497 Merge pull request #30302 2017-09-01 12:42:19 -04:00
MoreRobustThanYou
c48def94d8 Removes gangs (#30056) 2017-08-31 17:31:49 -03:00
Remie Richards
de7493ab6e UI objects should PIXEL_SCALE 2017-08-31 09:21:36 +01:00
pubby
6eb61d6f41 Crew monitoring rework part 1: crew pinpointers (#30117)
* Pinpointer refactor + Crew pinpointers

* Icon update

* Add crew pinpointers to maps, closets, and fix

* Fix defines

* Cyberboss fixes + add to warden and CMO

* More Cyberboss fixes
2017-08-30 18:02:28 -04:00
Jordan Brown
2c92735520 Port material containers to datum components (#29268)
* Ports /vg/'s component system

* Fix component signalling itself for addition

* Fix the list arrangement for removal

* Whoops

* Return the existing component if the created one was deleted

* These can't be ints

* ,

* returning TRUE from a callback will mark the event as handled

* Small refactor

* Add powered components

* R e f a c t o r

* More wip

* Fixes et al

* Pure pain

* When bae tells you she was tabs but she was actually spaces

* RReee

* Needs arglist

* Fax

* Fax

* More better

* You fail me yet again git commit

* Some kajiggering, but there we go

* No more 3rd param = variadic

* fix

* Sanity

* Whoops

* Minor thing

* Whoops

* fax

* Better describe the function, + add ..()s

* Fix

* Port to Initialize

* fuk in git
2017-08-30 15:11:34 +02:00
Cyberboss
f845183cf8 Merge pull request #30261 2017-08-30 08:58:08 -04:00
Jordan Brown
cf178de1b6 Server tools versioning and fix to displayed testmerges (#30252)
* Server tools versioning and fix to displayed testmerges

* Fixes
2017-08-30 10:15:12 +12:00
Jordan Brown
30573dc6f1 Adds defines for world.tick_usage (#30184)
* Add tick_usage define

* Move tick.dm -> _tick.dm

* Add TICK_USAGE_REAL define

* Add comments

* Replace all instances of tick usage with appropriate define
2017-08-30 10:09:24 +12:00
ninjanomnom
477bc11aa2 Removes the double loop 2017-08-28 16:31:16 -04:00
Leo
53a89cb3fd Reverts soft crit (#30260) 2017-08-28 21:09:29 +01:00
Jordan Brown
c1ef78f8c9 Soft crit (#28649)
* Soft crit

* Fix

* New define

* Fix shitcode

* Tabs not spaces

* Shitcomment

* Default to whispering in soft crit

* Fax
2017-08-28 14:42:11 -05:00
ShizCalev
7056b38410 Cleaned up environment_smash vars with bitflag defines (#30154)
* Switched to bitflags

* CB's change.

* fixed

* i can spell i swear

* cb2
2017-08-27 12:49:58 +02:00
Joan Lung
c208d1efa3 Some more tweaks to Geis (#29662)
* Some more tweaks to Geis

* fixes

* it rounds to 0.1

* let's bring this back

* this is kinda shitty but eh

* continually smart

* oh right
2017-08-24 20:46:15 -05:00
Shadowlight213
e458845453 Adds tracking amount of time spent playing departments 2: The fall of the Assistants. (#29105)
* Ports Paradise Job exp system

* changed to use json_decode and json_encode as recommended by oranges

* updates changelog

* Reee cyberboss

* Changes to use a seperate table

* Updates database changelog
Changes to use mediumint

* Back to wip we go.
Changes sql stuff to how mso suggested
Attempts the changes requested in the other pr.

* work on stuff.

* work on stuff.

* Renamed proc for time remaining.
Fixed updating time amounts.
Added delay to fix firing at roundstart

* exp is now stored in a global list, and only updated to the db at round end.

* some stuff

* Added button to toggle exempt status on a player.
Still need to make it update the db

* REEE Jordie.
Undoes delaying exp updating to round end.
Adds the updating filtering to the update_exp_client proc which is used again

* Lowers a bunch of the times needed.

* Makes tracking per job instead of per department.
Department time is now calculated from job time.

* Whoops forgot to update master first. Lemme save this

Reverb should play cheeki breeki to people

* I think I did this right.
Too tired to test atm.
Busy rewatching twintails ni narimasu

* Removes var from proc arguments
Fixes database stuff

* Does some requested changes.
Makes special_role be tracked instead of bundled under special.

* Done, but need to refactor how it handles ghost roles.

* Less false data wew

* Changes

* Updates db version
More changes

* More changes

* More changes

* revision fix

* OOPS

* fix schemas

* Makes SQL error logging handled by Execute
Gang role tracking now strips out the gang name and is generic.
2017-08-20 23:01:08 +12:00
Jordan Brown
641ba9c145 Merge pull request #29940 2017-08-17 10:13:00 -04:00
oranges
29e0863569 Merge pull request #29797 from Cyberboss/RemoveWorld
Moves most of world.dm
2017-08-17 10:51:28 +12: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
Jordan Brown
dce49b6caf Adds defines for mouse_opacity 2017-08-14 11:18:22 -04:00
Kyle Spier-Swenson
f2cf4c2f5c [ready]Makes bIcon better (#29690)
Goonchat will use the asset cache, you now have to specify who to send the icons too.

Goonchat will now load icons in the background, displaying them once they load. this prevents the message from being delayed while the icons are sent.

Icons that aren't preloaded using the asset cache system will not render on ie8 clients. This is because of a ie8 bug that prevents changes on runtime created images from rendering.
2017-08-14 10:40:50 +12:00
Jordan Brown
3c56d0f4f3 Ports duplicated slipping code to a component (#29628)
* Ports duplicated slipping code to a component

* Makes metal not slippery

* asdf

* Instead of cherry picking like an idiot I could just copy paster

* OOP

* And blood, don't forget Fry's blood!

* Further fixes

* A more generic fashion

* Use the new system

* Fixes

* Fix cartridge type

* Remove inertia
2017-08-09 16:06:15 +02:00
Cyberboss
8d702a196a Moves most of world.dm 2017-08-09 00:41:05 -04:00
Jordan Brown
d1ae0a0c95 Adds helpers to avoid << use (#29611) 2017-08-09 00:27:54 -03:00
Jordan Brown
1d05c4a936 Merge pull request #29767 2017-08-08 09:59:00 -04:00
shizcalev
22764665c9 CentCom Standardization 2017-08-07 19:04:27 -04:00
Joan Lung
a843118f81 Mechs can no longer open cult doors if the person inside is not a cultist 2017-08-07 11:51:57 -04:00
Jordan Brown
6806607425 Merge pull request #29369 2017-08-02 09:45:05 -04:00
XDTM
97fc07898c Merge branch 'master' into Hallucinations3.0 2017-07-29 12:43:18 +02:00
XDTM
59fdce8e66 Lotsa stuff 2017-07-29 12:36:48 +02:00
Qustinnus
7ecbb8a1b2 Merge branch 'master' into disgustport 2017-07-29 03:06:25 +02:00
Joan Lung
eda1a04b7f Clockcult combat changes (#29326)
* Clockcult combat changes

* boom

* nah, less

* text changes

* compile

* more compile
2017-07-28 20:45:36 -03:00
Jordan Brown
25c35c2829 Merge pull request #29455 2017-07-28 09:57:07 -04:00
Fox-McCloud
71c7e1fdee last tweaks 2017-07-27 17:45:08 -04:00
shizcalev
719612ba3b ALLOW ME TO BREAK THE ICE 2017-07-26 20:44:42 -04:00
Joan Lung
6d7e3f2281 Lava is no longer a plating subtype (#29463) 2017-07-25 22:16:02 -03:00
Fox-McCloud
c801be6894 defines and cleanup 2017-07-25 09:36:36 -04:00
Fox-McCloud
8527946927 Adds 3D Sound System 2017-07-23 07:03:16 -04:00
kevinz000
c48bd7ca08 Adds investigate logs to portals (#29334)
* Update teleportation.dm

* Update admin_investigate.dm

* Update logging.dm

* Update teleportation.dm

* Update teleportation.dm

* Update teleportation.dm

* Update teleportation.dm

* Update teleportation.dm

* Update teleportation.dm
2017-07-20 08:57:46 -04:00
Qustinnus
cb9b57adcc drinks and stuff 2017-07-19 23:50:05 +02:00
Qustinnus
e39d5d871f me making this port work https://www.oranges.net.nz/~oranges/webm/stuck_pancake.webm 2017-07-19 11:43:55 +02:00
Qustinnus
2312ff09be Fixing conflicts 2017-07-19 11:19:52 +02:00
Fox McCloud
c10c9442a5 Refactor Lung Handling (#29280)
* Refactor Lung Handling

* fix ups

* fixes
2017-07-18 10:58:23 -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
danno "big fucking moron" brando
9e969fd016 Augment Styles/Changes (#28977)
Full augment sets on the left, partial mix/match on the right.

This PR aims to make augmenting slightly more interesting than just turning your body grey, while also begin reminiscent of the cyborg parts that are actually used in the process.

Using the augment manipulator now found in robotics, one can insert a part and custom fit it to one of three different styles (security, engineering, and standard). Mix and match if you so choose, or make a full set for maximum style.
2017-07-18 18:35:01 +12:00
Emmett Gaines
1d201939ba [Ready] Shuttle dock() rewrite (#29049)
A complete rewrite of the dock proc for shuttles to make it more maintainable and readable and also bring over some new features while we're at it. This allows for multi-area shuttles and more control over the effects of anything being moved.

Areas, and movable atoms all have (before|on|after)ShuttleMove procs, turfs have (from|to)ShuttleMove procs which are called the same as beforeShuttleMove.

All ShuttleMove procs have been moved to a single file in the shuttle module.

Stationary docks will have their baseturf_type and area_type modified in maps once the problems have been worked out.
2017-07-17 12:17:56 +12:00
Jordan Brown
bcb85acb1e Ports /vg/'s datum component system (#29178)
* Ports /vg/'s component system
2017-07-17 12:10:25 +12:00