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 2026-01-01 04:34:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,645 Commits 55 Branches 0 Tags
db6fdc0f48d68ff2314cd40db8a39ea7b51d6bef
Commit Graph

6231 Commits

Author SHA1 Message Date
deathride58
adf349db02 Update spiders.dm 2018-04-29 18:44:31 -04:00
deathride58
9d33974316 Update absorb.dm 2018-04-29 18:44:14 -04:00
deathride58
c075dbfe81 Update changeling_power.dm 2018-04-29 18:43:52 -04:00
deathride58
e66e348d5c Merge pull request #6572 from Citadel-Station-13/upstream-merge-37535 
[MIRROR] Fixes gas fusion power not being taken into account
 2018-04-29 22:33:37 +00:00
deathride58
41e4851500 Merge pull request #6569 from Citadel-Station-13/upstream-merge-37559 
[MIRROR] Fix grammar when cleaning things with the damp rag
 2018-04-29 22:33:07 +00:00
deathride58
6ae31ccf69 Merge pull request #6564 from Citadel-Station-13/upstream-merge-37514 
[MIRROR] Fixes invisible turtleneck alt state
 2018-04-29 22:30:12 +00:00
oranges
187f27983c Merge pull request #37535 from cyclowns/fusion-fix 
Fixes gas fusion power not being taken into account
 2018-04-29 17:18:30 -05:00
Tad Hardesty
ed7b8e7128 Fix grammar when cleaning things with the damp rag 2018-04-29 14:27:51 -05:00
iksyp
ba4f3c0698 Makes pacifists able to use .50BMG Soporific Rounds (#37506) 
* non lethal .50BMG

* no more spaghetti sauce?

I havent actually tested this
 2018-04-29 10:11:42 -05:00
ShizCalev
1478e17fea Fixes invisible turtleneck alt state 2018-04-29 10:04:52 -05:00
LetterJay
c287c3a84c Merge pull request #6548 from Citadel-Station-13/upstream-merge-37483 
[MIRROR] Fixes obj descs and adds missing ones
 2018-04-29 02:29:44 -05:00
LetterJay
c11c2ba70f Merge pull request #6544 from Citadel-Station-13/upstream-merge-37479 
[MIRROR] Fixes being unable to place a Robotic Factory if it failed to place after the prompt
 2018-04-29 02:25:37 -05:00
LetterJay
89ffa04958 Merge pull request #6542 from Citadel-Station-13/upstream-merge-37442 
[MIRROR] Fixes jumpToNullSpace
 2018-04-29 02:24:52 -05:00
LetterJay
eddeff9c34 Merge pull request #6541 from Citadel-Station-13/upstream-merge-37385 
[MIRROR] Makes clogged vents scale, and way less powerful.
 2018-04-29 02:24:30 -05:00
LetterJay
e8fdaa1a43 Merge pull request #6539 from Citadel-Station-13/upstream-merge-37453 
[MIRROR] set waitfor in final countdown
 2018-04-29 02:21:56 -05:00
LetterJay
480882de58 Merge pull request #6538 from Citadel-Station-13/upstream-merge-37449 
[MIRROR] Removes some unused code.
 2018-04-29 02:21:31 -05:00
LetterJay
261e7fa1c1 Merge pull request #6537 from Citadel-Station-13/upstream-merge-37482 
[MIRROR] Fixes slime pressurization potion attempting to apply multiple times
 2018-04-29 02:21:07 -05:00
Jordan Brown
db142667b7 Merge pull request #37501 from ShizCalev/icon-fixes 
Fixes missing icons
 2018-04-28 14:54:45 -05:00
LetterJay
b565ef9171 Merge pull request #6557 from Citadel-Station-13/upstream-merge-37384 
[MIRROR] Re-adds and reworks fusion.
 2018-04-28 14:07:08 -05:00
LetterJay
811cc06188 Merge pull request #6536 from Citadel-Station-13/upstream-merge-37436 
[MIRROR] Adds a stationloving component to replace a couple of flags and SSinbounds with
 2018-04-28 01:36:04 -05:00
LetterJay
ec1a16fed0 Merge pull request #6535 from Citadel-Station-13/upstream-merge-37480 
[MIRROR] Fixes pineapple pizza not actually tasting like pineapple
 2018-04-28 01:35:41 -05:00
LetterJay
d10dcf7cd7 Merge pull request #6534 from Citadel-Station-13/upstream-merge-37445 
[MIRROR] you can now print tools using the integrated circuit printer again
 2018-04-28 01:34:59 -05:00
as334
9b36d6c4d9 Re-adds and reworks fusion. (#37384) 
add: Fusion is back
add: Fusion now happens with large quantities of hot plasma and CO2, consuming all the plasma rapidly and producing large amounts of energy. Other gases can also effect the performance of the reaction.
add: Fusion now produces radiation. Be careful around reactors.
fix: fixes fusion dividing by zero and destroying everything
code: Gas reactions now have access to where they are occurring
fix: Prevents some other reactions from producing matter from nothing
 2018-04-28 01:01:47 -05:00
kevinz000
6ed120aad4 NTNet improvements! 2018-04-27 20:24:28 -05:00
PKPenguin321
dee55fa47d adds new changeling var that counts actual absorbs, uses it for Spiders ability 2018-04-27 20:22:14 -05:00
81Denton
b368ab377b fixes obj descs and adds new ones (#37483) 2018-04-27 13:21:08 -05:00
Dax Dupont
4850230fc4 Refactors and fixes RPEDs 2018-04-27 13:13:37 -05:00
ShizCalev
c9ac7ab2a1 Fixes being unable to place a Robotic Factory (#37479) 2018-04-27 13:12:15 -05:00
Emmett Gaines
b866e62673 Fixes jumpToNullSpace (#37442) 
woops
 2018-04-27 13:05:44 -05:00
Dax Dupont
df3c160d0c Makes clogged vents scale, and way less powerful. (#37385) 
* Makes clogged vents scale, and way less powerful.

* tweaked numbers
 2018-04-27 13:05:36 -05:00
Emmett Gaines
620c1fcbb8 set waitfor in final countdown (#37453) 2018-04-27 13:02:09 -05:00
AnturK
b8bb30d3de Removes some unused code. (#37449) 2018-04-27 10:33:10 -05:00
deathride58
d2fbb671ba Removes ADS + other combat mode tweaks, makes adjuststaminabuffer() affect borg cells, adds sprinting for borgs (#6498) 
* adjuststaminabuffer() now drains borg cells, borgs can now sprint, removes aiming down sights, combat mode now makes you face your cursor

* forgot to ctrl+s here
 2018-04-27 07:41:31 -07:00
deathride58
862898526d Gamemode and gamemode vote obfuscation (Plus hub entry rework) (#6276) 
* adds gamemode/gamemode vote obfuscation, redesigns hub entry

* ternaries: the easiest way to obfuscate your code to the point where even you can't read it

* FUCK

* changes the inaccuracy chance from 1/10 to 1/5
 2018-04-27 07:40:45 -07:00
deathride58
681bbb1bb0 Adds follow link to admin LOOC messages (#6378) 
* adds follow link to looc messages shown to admins

* fixes
 2018-04-27 07:39:01 -07:00
oranges
ce31767862 Merge pull request #37482 from vuonojenmustaturska/bluepot 
Fixes slime pressurization potion attempting to apply multiple times
 2018-04-27 08:12:10 -05:00
vuonojenmustaturska
d6b48869d8 Adds a stationloving component to replace a couple of flags and SSinbounds with (#37436) 
* station lovin' happened so fast

* Update stationloving.dm

* less qdel memes

* imbue soul signal

* rename imbue soul signal

* dupemode

* henk

* Update atoms_movable.dm

* Update nuclearbomb.dm

* Update nuclearbomb.dm
 2018-04-27 07:37:15 -05:00
oranges
08f9dc0e8a Merge pull request #37480 from ShizCalev/pineapple-meme 
Fixes pineapple pizza not actually tasting like pineapple
 2018-04-27 07:29:39 -05:00
Nich
c9702d2a5c you can now print tools using the integrated circuit printer again (#37445) 
* you can now print tools again

* I'm severely mentally retarded

* Update printer.dm
 2018-04-27 05:17:42 -05:00
deathride58
c0bc86ef21 Merge pull request #6533 from Citadel-Station-13/upstream-merge-37452 
[MIRROR] [s]fixes significant invulnerability exploit
 2018-04-27 09:43:11 +00:00
deathride58
532ccc412c Merge pull request #6532 from Citadel-Station-13/upstream-merge-37373 
[MIRROR] Fixes missing augmentation hands
 2018-04-27 09:42:46 +00:00
deathride58
91a6274e81 Merge pull request #6530 from Citadel-Station-13/upstream-merge-37435 
[MIRROR] Updates syndicate hardsuit uplink description to not say it's unremovable
 2018-04-27 09:42:05 +00:00
deathride58
28dd1a28ab Merge pull request #6528 from Citadel-Station-13/upstream-merge-37439 
[MIRROR] admins can now var edit the sound frogs make when they are stepped on
 2018-04-27 09:41:14 +00:00
deathride58
eb0c82708c Merge pull request #6527 from Citadel-Station-13/upstream-merge-37443 
[MIRROR] Paperwork Error Event
 2018-04-27 09:40:57 +00:00
deathride58
455216c094 Merge pull request #6525 from Citadel-Station-13/upstream-merge-37337 
[MIRROR] Adds a picker tool to advanced buildmode
 2018-04-27 09:40:12 +00:00
deathride58
80a4f04d94 Merge pull request #6524 from Citadel-Station-13/upstream-merge-37342 
[MIRROR] Makes it possible to see tiles past z transitions
 2018-04-27 09:39:52 +00:00
deathride58
d972ecc891 Merge pull request #6523 from Citadel-Station-13/upstream-merge-37407 
[MIRROR] Removes Acid from Remaining Circuits
 2018-04-27 09:39:29 +00:00
deathride58
85f0c174c1 Merge pull request #6520 from Citadel-Station-13/upstream-merge-37313 
[MIRROR] Makes the experimentor only output one copy of something.
 2018-04-27 09:37:33 +00:00
deathride58
3bb8902846 Merge pull request #6518 from Citadel-Station-13/upstream-merge-37413 
[MIRROR] Gives admins the D(say) hotkey + fixes buildmode permissions
 2018-04-27 09:36:44 +00:00
deathride58
5172d2ae09 Merge pull request #6517 from Citadel-Station-13/upstream-merge-37416 
[MIRROR] Fixes the stock market having random, spontaneous exponential value spikes.
 2018-04-27 09:36:23 +00:00