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-10 18:02:57 +00:00
Code Issues Packages Projects Releases Wiki Activity
8,855 Commits 55 Branches 0 Tags
d8847ea1673b36ad3e5c1778ae8cc65ffbb6fb9a
Commit Graph

3465 Commits

Author SHA1 Message Date
Mercenaryblue
16c2f8f4c7 Honkbots Tablecrafting 
You can now tablecraft Honkbots.
 2017-10-31 12:26:59 -05:00
LetterJay
6e4e0e4f2d Merge pull request #3709 from Citadel-Station-13/upstream-merge-32118 
[MIRROR] actually fixes not being able to stop wagging your tail this time
 2017-10-31 03:03:58 -04:00
LetterJay
1d992f2dfd Merge pull request #3705 from Citadel-Station-13/upstream-merge-32222 
[MIRROR] Ignore verb now also shows ghost names
 2017-10-31 03:02:05 -04:00
LetterJay
59bea99c4b Merge pull request #3702 from Citadel-Station-13/upstream-merge-32123 
[MIRROR] Removes statues from the gold slime pool
 2017-10-31 03:01:34 -04:00
LetterJay
a0f3edf6ca Merge pull request #3701 from Citadel-Station-13/upstream-merge-32150 
[MIRROR] Meteor gating tweaks
 2017-10-31 03:00:49 -04:00
LetterJay
32fb136bf0 Merge pull request #3589 from Citadel-Station-13/upstream-merge-31855 
[MIRROR] Dullahans
 2017-10-30 23:54:25 -04:00
LetterJay
09a198fb65 Merge pull request #3694 from Citadel-Station-13/upstream-merge-32225 
[MIRROR] Deterministic output slots for smartfridges
 2017-10-30 23:32:39 -04:00
LetterJay
53314289c8 Merge branch 'master' into upstream-merge-31855 2017-10-30 23:31:13 -04:00
LetterJay
1092b020f4 Merge pull request #3690 from Citadel-Station-13/upstream-merge-32214 
[MIRROR] Fixes old simple animal humanoid issues
 2017-10-30 22:14:32 -04:00
LetterJay
df6bd6fa4c Merge pull request #3682 from Citadel-Station-13/upstream-merge-32140 
[MIRROR] Fixes filling smoke machines with pills
 2017-10-30 22:11:44 -04:00
LetterJay
6963ad2aac Merge pull request #3680 from Citadel-Station-13/upstream-merge-32041 
[MIRROR] Excludes clockwork wargolems from golem mutation toxin, nerfs normal clockwork golems
 2017-10-30 22:11:33 -04:00
LetterJay
49dce5c9ea Update emote.dm 2017-10-30 21:09:00 -05:00
LetterJay
ca1581bd11 Update emote.dm 2017-10-30 20:35:24 -05:00
kevinz000
93f39805e9 actually fixes not being able to stop wagging your tail this time 2017-10-30 15:24:38 -05:00
Jordan Brown
909f1ba244 Merge pull request #32222 from AnturK/ignoreprovement 
Ignore verb now also shows ghost names
 2017-10-30 15:06:37 -05:00
jughu
b6fea33316 Removes statues from the gold slime pool (#32123) 
* Update statue.dm

* Update statue.dm
 2017-10-30 14:53:56 -05:00
Jordan Brown
ba1d3fd2c2 Merge pull request #32150 from MrStonedOne/patch-442 
Meteor gating tweaks
 2017-10-30 14:51:44 -05:00
vuonojenmustaturska
5bd7184d9c Deterministic output slots for smartfridges (#32225) 
* a spooky commit

* It is too late, the skeleton is already inside you

* mexican river dolphins for halloween 2018

* Compiler warnings for halloween 2018
 2017-10-30 14:35:26 -05:00
bawhoppen
f8bd9ecf9c Fixes old simple animal humanoid issues (#32214) 
* fixes issue

* ignore that

* Spacebattle doesn't even open in DM

* Conflicts fixed for real

* Fixes pathing weirdness

* wonderful
 2017-10-30 06:50:04 -05:00
LetterJay
b6a04b6649 Merge pull request #3689 from Citadel-Station-13/CharacterCreation 
Fixes character issues on creation
 2017-10-30 07:02:15 -04:00
LetterJay
ed2208a7ea Merge pull request #3687 from Michiyamenotehifunana/CRITICAL-SPRITER-CRAP-NERFS 
CRITICAL BALANCE FIXES TO CITADEL'S GUNS
 2017-10-30 06:33:15 -04:00
LetterJay
e0cbc7b9a2 Fixes character issues on creation 2017-10-30 05:32:06 -05:00
Michiyamenotehifunana
d0a28fcd62 NERF EVERYTHING 
EVERYTHING OP NERF NOW also what the fuck how does a whole playerbase ignore balance issues for a whole fucking month only for a vilified member of the community to be so fucking helpful
 2017-10-30 15:01:37 +08:00
LetterJay
969f92fb58 Delete nudge.py 2017-10-30 01:48:48 -05:00
LetterJay
fba46cd0e5 Delete server_tools.dm 2017-10-30 01:48:42 -05:00
LetterJay
48cc684de0 Update golems.dm 2017-10-29 22:41:23 -05:00
LetterJay
b0573cc67f Merge pull request #3678 from Citadel-Station-13/upstream-merge-32144 
[MIRROR] Adds new valentines; replaces outdated/shitty ones.
 2017-10-29 23:38:55 -04:00
LetterJay
715a2fb918 Merge pull request #3677 from Citadel-Station-13/upstream-merge-32080 
[MIRROR] Ice Spiders now use frost oil instead of toxin
 2017-10-29 23:37:58 -04:00
PKPenguin321
e486038c2e Fixes filling smoke machines with pills (#32140) 
Fixes #32102

Checks for the OPENCONTAINER flag after seeing if the object being used to fill the smoke machine has reagents in it
 2017-10-29 16:01:34 -05:00
LetterJay
2715fa9953 Merge pull request #3679 from Citadel-Station-13/upstream-merge-32174 
[MIRROR] Halloween race fixes
 2017-10-29 16:05:19 -04:00
LetterJay
66245d9451 Merge pull request #3674 from Citadel-Station-13/upstream-merge-32154 
[MIRROR] Events take pre-game lobby time into account
 2017-10-29 15:52:13 -04:00
LetterJay
c5565dff94 Merge pull request #3669 from Citadel-Station-13/upstream-merge-32168 
[MIRROR] One more thing to allow more mobs to qdel nicely
 2017-10-29 15:50:44 -04:00
LetterJay
254ffca3b7 Merge pull request #3668 from Citadel-Station-13/upstream-merge-32162 
[MIRROR] Actually fixes meteors, again
 2017-10-29 15:49:40 -04:00
LetterJay
47cfffbb26 Merge pull request #3648 from Citadel-Station-13/upstream-merge-32116 
[MIRROR] Line by line profiling system
 2017-10-29 15:48:47 -04:00
Ashe Higgs
284b265a65 Excludes clockwork wargolems from golem mutation toxin, nerfs normal clockwork golems 2017-10-29 13:57:10 -05:00
KorPhaeron
edfc86c895 Halloween race fixes 2017-10-29 12:31:38 -05:00
bgobandit
adf7bdccbd Adds new valentines; replaces outdated/shitty ones. (#32144) 
* adds valentines, cuts old references

* Adds valentines, replaces outdated ones

* more entendre-y
 2017-10-29 11:04:04 -05:00
Armhulen
9c63e30e2f Ice Spiders now use frost oil instead of toxin (#32080) 
* PARASTENG!!

* just monika
 2017-10-29 11:02:50 -05:00
Kyle Spier-Swenson
8d234df96f Events take pre-game lobby time into account (#32154) 
* Events take pre-game lobby time into account

* Friends don't let friends code without coffee.

It would appear that  I have no friends

* i blame cyberboss
 2017-10-29 10:36:56 -05:00
Jordan Brown
4b297f509e 512 forward compatibility merge 2017-10-29 10:28:36 -05:00
vuonojenmustaturska
53c9c16fe3 one more thing to allow more mobs to qdel nicely (#32168) 2017-10-29 07:14:44 -05:00
vuonojenmustaturska
d6d01ab630 Actually fixes meteors, again (#32162) 
* Actually fixes meteors, again

* unrelated typo fix for an admin debug verb
 2017-10-29 07:13:31 -05:00
LetterJay
f900f2ea9a Merge pull request #3660 from Citadel-Station-13/upstream-merge-31864 
[MIRROR] Makes thermite a component
 2017-10-29 04:23:16 -04:00
LetterJay
077e2a1598 Merge pull request #3655 from Citadel-Station-13/upstream-merge-32112 
[MIRROR] "Mummies" (cloth golems) for Halloween
 2017-10-29 04:20:28 -04:00
LetterJay
2503a90dc0 Merge pull request #3585 from Michiyamenotehifunana/CX-sword 
Adds fancy Energy Swords (and a toy version)
 2017-10-29 03:56:27 -04:00
LetterJay
41eb83fb3d Merge pull request #3658 from Citadel-Station-13/upstream-merge-32127 
[MIRROR] [s] Blocks world proc calls
 2017-10-29 03:47:43 -04:00
LetterJay
fb24abfaf7 Merge pull request #3652 from Citadel-Station-13/upstream-merge-32142 
[MIRROR] Remove stray parent proc call in collector code
 2017-10-29 03:46:30 -04:00
LetterJay
13891ec34b Merge pull request #3651 from Citadel-Station-13/upstream-merge-32107 
[MIRROR] Adds some new grindables to the grinder
 2017-10-29 03:46:19 -04:00
LetterJay
7402fab19e Merge pull request #3650 from Citadel-Station-13/upstream-merge-32137 
[MIRROR] Remove some unneeded null checks in lighting
 2017-10-29 03:46:05 -04:00
LetterJay
4b300cee6c Merge branch 'master' into upstream-merge-32116 2017-10-29 03:45:59 -04:00