cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-28 02:34:35 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,357 Commits 55 Branches 0 Tags
ea47d74997658924a6b50676a9f1dbf0cac1852d
Commit Graph

6947 Commits

Author SHA1 Message Date
jughu
d5472ab6e4 ha (#33391) 2017-12-10 13:03:30 -06:00
Tad Hardesty
41b0dbe36f Fix MULEbot id numbers showing nowhere but the alt-click menu (#33413) 2017-12-10 12:55:12 -06:00
AnturK
030812035f Undelaying will now reboot the server normally. (#33423) 2017-12-10 12:54:02 -06:00
coiax
9d59e36289 Add caltrop component for spikey floor objects (#33280) 
* Add caltrop component for spikey floor objects

The caltrop component now can be added to any crossable atom, and it'll
act like a shard of glass, or a d4. Additional flags are possible for it
to bypass shoes or ignore people who are walking.

This means d4 don't reimplement shard logic, and also open the window
for caltrop grenades later.

Also, it taught me how components work.

* Code review I

* Caltrop damage is 4

* Cactus hurts

* Whoops

* Ignore restraints = true
 2017-12-10 10:32:03 -06:00
Jordan Brown
96a2a7700d Merge pull request #33396 from AnturK/tooltip-fix 
Fixes tooltip offsets
 2017-12-10 10:26:44 -06:00
oranges
c59209a34f Merge pull request #33392 from vuonojenmustaturska/patch-1 
[s]Ghost altclick fix for pet carriers
 2017-12-10 02:53:02 -06:00
deathride58
e18457f92e Merge pull request #4284 from Citadel-Station-13/upstream-merge-33356 
[MIRROR] Fixes meth explosions throwing warnings
 2017-12-10 03:12:19 +00:00
deathride58
a17e7ae3cf Merge pull request #4283 from Citadel-Station-13/upstream-merge-33358 
[MIRROR] Replace pAI verb tab with an action button
 2017-12-10 03:11:54 +00:00
deathride58
80ae897f5e Merge pull request #4285 from Citadel-Station-13/upstream-merge-33373 
[MIRROR] Add a proc to check if a weather type is affecting an area
 2017-12-10 03:09:50 +00:00
deathride58
6ef12d993b Merge pull request #4289 from Citadel-Station-13/upstream-merge-33263 
[MIRROR] People pulling/grabbing a defib target now gets shocked harmfully when the defib goes off
 2017-12-10 03:09:28 +00:00
deathride58
1906ead618 Merge pull request #4290 from Citadel-Station-13/upstream-merge-33241 
[MIRROR] Adds some suicide acts
 2017-12-10 03:08:57 +00:00
deathride58
fe4864f8ed Merge pull request #4291 from Citadel-Station-13/upstream-merge-33365 
[MIRROR] Adds AI Vox Sound Output Circuit
 2017-12-10 03:08:19 +00:00
deathride58
0c7bc2f3fe Merge pull request #4292 from Citadel-Station-13/upstream-merge-33376 
[MIRROR] Flickering no longer enables emergency lights
 2017-12-10 03:07:54 +00:00
deathride58
f83da95eb0 Merge pull request #4294 from Citadel-Station-13/upstream-merge-33390 
[MIRROR] cleans up atmos defines
 2017-12-10 03:07:27 +00:00
deathride58
9387b4a9c8 Merge pull request #4295 from Citadel-Station-13/upstream-merge-33386 
[MIRROR] Remove meaningless "Type too long" message from VV
 2017-12-10 03:06:57 +00:00
deathride58
15b51f6c6c Merge pull request #4297 from Citadel-Station-13/upstream-merge-33384 
[MIRROR] Allows for qdel in shuttleMove procs
 2017-12-10 03:06:31 +00:00
deathride58
79bbf1085b Merge pull request #4298 from Citadel-Station-13/upstream-merge-33389 
[MIRROR] Fixes spelling error
 2017-12-10 03:06:18 +00:00
deathride58
7d3739dddb Merge pull request #4296 from Citadel-Station-13/upstream-merge-33397 
[MIRROR] Fixes emergency lights having infinite power, and replaces their magic number with a define
 2017-12-10 03:06:03 +00:00
Jordan Brown
ae48e14876 Merge pull request #33371 from ninjanomnom/walk-backwards-into-hell 
Step backwards version of hex2num
 2017-12-09 15:54:14 -06:00
Jordan Brown
0c93857bc5 Merge pull request #33389 from LuigiBoi/patch-1 
Fixes spelling error
 2017-12-09 15:54:06 -06:00
Jordan Brown
b6653dd94c Merge pull request #33384 from ninjanomnom/deletes-in-my-shutle-subsystem 
Allows for qdel in shuttleMove procs
 2017-12-09 15:53:57 -06:00
Jordan Brown
2029473a48 Merge pull request #33397 from Xhuis/em_light_fix 
Fixes emergency lights having infinite power, and replaces their magic number with a define
 2017-12-09 15:53:49 -06:00
Jordan Brown
906ed84674 Merge pull request #33386 from AutomaticFrenzy/patch/type-too-long 
Remove meaningless "Type too long" message from VV
 2017-12-09 15:53:42 -06:00
Jordan Brown
7a90baa1f8 Merge pull request #33390 from duncathan/atmos-defines 
cleans up atmos defines
 2017-12-09 15:53:34 -06:00
Jordan Brown
8b41dacba9 switches lobes for grammar n shit 2017-12-09 15:53:27 -06:00
Jordan Brown
7b9bcb37aa Merge pull request #33376 from Xhuis/patch-3 
Flickering no longer enables emergency lights
 2017-12-09 15:53:20 -06:00
Jordan Brown
3de5ed055f Merge pull request #33365 from KomradeSpectre/vox_circuit 
Adds AI Vox Sound Output Circuit
 2017-12-09 15:53:12 -06:00
Jordan Brown
70be12aa1c Merge pull request #33241 from swindly/suicide 
Adds some suicide acts
 2017-12-09 15:52:53 -06:00
LetterJay
edce62494d Merge pull request #4082 from deathride58/donoritemmodularization 
Donator item modularization + manual sync of sprites with upstream + manual mirrors + donor item fixes
 2017-12-09 15:52:44 -06:00
Jordan Brown
00c17ad6e5 Merge pull request #33263 from kevinz000/patch-402 
People pulling/grabbing a defib target now gets shocked harmfully when the defib goes off
 2017-12-09 15:52:35 -06:00
XDTM
8502e058b2 Makes godwoken syndrome a bit more reliable 2017-12-09 01:58:18 -06:00
oranges
98a0602b1a Add a proc to check if a weather type is affecting an area (#33373) 2017-12-09 01:36:40 -06:00
ACCount
3c9758fe80 Fixes meth explosion throwing warnings (#33356) 2017-12-09 01:09:04 -06:00
Tad Hardesty
0a71554d7f Replace pAI verb tab with an action button (#33358) 
pAI suicide is now standardized with other suicides. The Software
Interface verb has been changed to an action button. This eliminates the
need for a verb tab for only two verbs.
 2017-12-08 22:46:30 -06:00
kevinz000
75eab09dff Revert "[MIRROR] [ready]Timer queuing tweaks: binary sorted inserts and rolling buckets." 2017-12-08 19:16:49 -08:00
deathride58
742d50b5e7 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into donoritemmodularization 
# Conflicts:
#	code/citadel/custom_loadout/custom_items.dm
#	code/datums/components/riding.dm
#	code/game/objects/items/implants/implantuplink.dm
#	icons/mob/neck.dmi
#	icons/obj/clothing/cloaks.dmi
 2017-12-08 19:58:41 -05:00
Kyle Spier-Swenson
811517ecb2 [ready]Timer queuing tweaks: binary sorted inserts and rolling buckets. (#33098) 
* Timer queuing tweaks: binary sorted inserts and rolling buckets.

Client time timers now uses a binary search algorithm for its sorted inserts.

Processing now uses a binary sorted insert, rather then sorting it with sortTim during bucket_shifts.

Buckets now automatically wrap around rather then get regenerated every minute. (Rolling queue)

* Fixes some queue management bugs.

* Fixes a Order of Operations goof up in the ticks<->ds macros.

@ninjanomnom your pain is my success

* Remove debug line

* Fixes some binary insert bugs, fixes client time timers, moved id over to GUID

* Fixes initialization-time timers fucking everything up
 2017-12-08 15:02:18 -06:00
deathride58
a8311d6adf Merge pull request #4263 from Citadel-Station-13/upstream-merge-33341 
[MIRROR] Fixes mugs being called "broken bottles"
 2017-12-08 20:24:51 +00:00
deathride58
7ca945c96b Merge pull request #4278 from Citadel-Station-13/upstream-merge-33370 
[MIRROR] Fixes certain material containers
 2017-12-08 19:35:43 +00:00
deathride58
4600a6eb87 Update drinks.dm 2017-12-08 14:07:33 -05:00
deathride58
0c8bdab295 Merge pull request #4279 from Citadel-Station-13/upstream-merge-33357 
[MIRROR] Prevents (cat)grilles from magically regenerating.
 2017-12-08 19:06:46 +00:00
deathride58
f75b36af75 Merge pull request #4176 from Michiyamenotehifunana/holy-crap-it-took-so-long-to-make-this-armor 
Adds RGB knights and more!
 2017-12-08 18:54:59 +00:00
deathride58
e9932c4f40 Merge pull request #4277 from Citadel-Station-13/upstream-merge-33362 
[MIRROR] Fixes random in random seeds
 2017-12-08 18:53:15 +00:00
deathride58
9715e9c685 Merge pull request #4232 from cebutris/borers 
Removes borer event from rotation
 2017-12-08 18:52:58 +00:00
deathride58
53ab4feb2f Merge pull request #4270 from Citadel-Station-13/upstream-merge-33324 
[MIRROR] [Ready] Makes the default view range a config option (Allows hosts to enable widescreen)
 2017-12-08 18:47:56 +00:00
deathride58
7cb2337c7f Merge pull request #4266 from Citadel-Station-13/upstream-merge-33345 
[MIRROR] Fixes some broken random events
 2017-12-08 18:47:22 +00:00
deathride58
2275d59305 Merge pull request #4276 from Citadel-Station-13/upstream-merge-33359 
[MIRROR] Fixes air alarm gas thresholds being impossible to change
 2017-12-08 18:46:33 +00:00
deathride58
665cef7a35 Merge pull request #4260 from Citadel-Station-13/upstream-merge-33231 
[MIRROR] Adds pet carriers
 2017-12-08 18:46:07 +00:00
deathride58
e3f5876419 Merge pull request #4275 from Citadel-Station-13/upstream-merge-33329 
[MIRROR] hopefully optimizes process_cell() a touch
 2017-12-08 18:45:17 +00:00
deathride58
6c774d7798 Update mech_fabricator.dm 2017-12-08 13:43:33 -05:00