Commit Graph

21010 Commits

Author SHA1 Message Date
PJB3005
cc538427dd I blew it 2015-12-20 20:47:30 +01:00
clusterfack
644acd3fcd Merge pull request #7022 from clusterfack/memename
Fix #7010
2015-12-14 03:07:45 -06:00
clusterfack
a9c7b6bb7c Fix stuff, help narnar
(The time to sleep for x ticks, is x * tick_lag not x / tick_lag)
2015-12-14 03:02:42 -06:00
clusterfack
08999ab537 Fix #7010
Escape pods were never converted to shuttles but still use hyperspace causing issues.
2015-12-14 02:42:58 -06:00
Rob Nelson
9fdaeed0dd Merge pull request #6940 from gbasood/feature-statistics-gathering
[Merge-ready once more] Statistics Gathering
2015-12-13 21:38:39 -08:00
Rob Nelson
469e3a48ca Merge pull request #7012 from 9600bauds/botany3.0.0.0.0.1
Fixes fruit smudges having weird names
2015-12-13 21:37:26 -08:00
DrCelt
484b82f074 Ready to merge do not not merge. snow paths, wooden doors and other sprited by nienhaus, expanded by skullyton. campfires, spits, and fireplaces sprited by eliminator, stoves sprited by niggly. all coded by celt (badly). 2015-12-14 04:18:39 +00:00
9600bauds
5fe037a0d8 Fixes fruit smudges having weird names 2015-12-13 21:50:56 -03:00
PJB3005
666a1f5d0e Merge pull request #7011 from 9600bauds/whoopslol
shit
2015-12-14 01:03:44 +01:00
9600bauds
d5e2f5018f haha lol whoops :) 2015-12-13 20:34:56 -03:00
Kurfursten
2c3316e2a8 Goodbye Tendies
Continued progress

Cooks: Ready

Changed changelog and how to extract sacs

Goodbye Tendies

Goodbye Tendies
2015-12-13 14:14:26 -06:00
9600bauds
2e7d19ee5c If I rebase, noone can see my shit commit names
Oregon Trail 2: Return to Mississippi

look at me, clusterfack would be proud

Makes the Seed Extractor not awful

Squashes a couple of bugs with seed diverging and plant cuttings, removes unused variables.

Xenobotany & Shit

fak u

(B) HATE CONFLICT

Break Deity's fix again because clusterfack said so

like my old grandma used to say, "remember to commit often with descriptive commit names"

I SURE CANNOT WAIT TO FIX CONFLICTS ON PACID FOR THE FOURTH TIME

The Changelog Is Here

I have done as thy asked

remember to test your shit!

thank you for testing!

wait a sec this doesn't fire on process() anyways

Glowy plant no hate glow

SOIL IS NOT MACHINE

Fixed bio-lum fruits not glowing, added harvesting kudzu with plant bags, kudzu will only grow when mature

Push my Face into the Sun

I forgot about this

Thank you anonymous person
2015-12-13 16:44:47 -03:00
clusterfack
570cc63b40 Merge pull request #7003 from 9600bauds/formattingsoundandtypo
Formatting, sound, and typo
2015-12-13 13:25:04 -06:00
clusterfack
febe04ac6a Merge pull request #6984 from clusterfack/fixsomeshuttlething
Fixes #6950
2015-12-13 13:24:21 -06:00
clusterfack
0ce8e8e4e2 Merge pull request #6991 from clusterfack/whydidwerevertthis
Spawn()s minimaps again
2015-12-13 13:23:41 -06:00
clusterfack
3ff318ec06 Merge pull request #6996 from clusterfack/goddamnmotherfuckershitfuckcuntbitch
Fixes #5746
2015-12-13 13:22:36 -06:00
clusterfack
e86a19c21e Merge pull request #6995 from clusterfack/codeisstupid
Fix walls that don't exist
2015-12-13 13:21:22 -06:00
clusterfack
eb2d5147da Merge pull request #7002 from 9600bauds/whoaddedthisfuckingthing
I AM THE LAW
2015-12-13 13:20:35 -06:00
clusterfack
c99e3527a6 Merge pull request #6990 from 9600bauds/ididnteventestthis
Fixes #6985
2015-12-13 13:18:14 -06:00
Sood
47683b678c defines pls 2015-12-13 11:00:02 -08:00
Sood
5262baaa59 Bugfixes, documentation. 2015-12-13 10:42:30 -08:00
9600bauds
7c884ab7ac Formatting, sound, and typo 2015-12-13 15:37:43 -03:00
9600bauds
bfd68c3ad4 Fixes the Lawgiver 2015-12-13 14:49:34 -03:00
Sood
987f551622 Statistics collection initial work 2015-12-13 08:32:52 -08:00
clusterfack
2aa83849b5 Fixes my typo 2015-12-13 01:32:34 -06:00
clusterfack
faf1d9ca2d Fixes #5746
Recodes it in such a way that the spawn shouldn't break if the turf undergoes a changeturf during the animation.
2015-12-13 01:04:01 -06:00
clusterfack
b2a875e3a8 Fix walls that don't exist
To be honest I thought there was an issue for this made (there was one in the past but I fixed it in a different way), this prevent the issue from ever occurring entirely.
2015-12-13 00:38:41 -06:00
clusterfack
d97e0006ca Spawn()s minimaps again
We had this and it got reverted for no reason whatsoever, and the minimaps trigger a lot of people.
2015-12-12 15:11:08 -06:00
9600bauds
4378724c05 Fixes #6985 2015-12-12 18:00:10 -03:00
clusterfack
88c2fe3207 Merge pull request #6987 from dylanstrategie/AME
Fix AME logging to include player's ckey
2015-12-12 14:28:48 -06:00
clusterfack
71f6885ba3 Merge pull request #6986 from wwjnc/pjbmorelikepjblewit
Fixed sound in `playsound_local()` being played with `to_chat()`
2015-12-12 14:28:26 -06:00
clusterfack
261bbe34c9 Merge pull request #6989 from 9600bauds/funfactbutcheringpolygivescrackersinsteadofmeat
Fixes #6974 but also adds hella epik references
2015-12-12 14:28:15 -06:00
clusterfack
aaeb7ff92f Merge pull request #6983 from clusterfack/fuckingtabsareshitty
Removes the Debug and Server tab for non-admins
2015-12-12 14:27:18 -06:00
9600bauds
a88bdb67db A descriptive commit name for an atomic PR 2015-12-12 16:55:29 -03:00
9600bauds
b7d6e2a623 A descriptive commit name for an atomic PR 2015-12-12 16:34:19 -03:00
dylanstrategie
02d6edfa51 Use real_name 2015-12-12 20:32:33 +01:00
clusterfack
c5519999e7 Chemistry - Proper Sanity
..() - this does nothing if you just call it like this, what's the point

Use if(..()) return 1 along with return 1s where the proc is supposed to fail in the parent to actually have sanity
2015-12-12 13:08:52 -06:00
dylanstrategie
0eba39e4c2 Fix AME logging to include player's ckey 2015-12-12 20:01:17 +01:00
wwjnc
a5ae82e7b9 Fixed sound in playsound_local() being played with to_chat() 2015-12-12 19:39:58 +01:00
clusterfack
0d1c2af69b Fixes #6950
By adding another argument to changeturf to specially allow changeturf to be called on hyperspace transit turfs, we prevent anything but shuttles changing the turf of these hyperspace transit turfs. Fixing the issue by preventing this kind of thing from being changed.
2015-12-12 12:13:47 -06:00
clusterfack
c23347c0c3 Removes the Debug and Server tab for non-admins
Deals with the 6 or so verbs that show up when you aren't an admin

-Both nano map generators have been moved to mapping (debug verbs) tab so that they aren't seen by everyone needlessly.
-The hard del() checking proc was fixed (it did NOTHING for months), improved, and moved to debug verbs as well
-THe check mob list is now hidden, can still be accessed by typing the verb with . infront of it in case it is necessary
-The debug verb for cameras, view datum, is commented out because it's debug code for testing a specific thing
2015-12-12 11:42:02 -06:00
clusterfack
b17feaa491 Incorrect reference, works as intended now 2015-12-12 08:01:00 -06:00
Rob Nelson
248a64c409 Oh fuck me I'm an idiot 2015-12-12 04:07:37 -08:00
Rob Nelson
91d7777f68 Exploit fix for MoMMI spawner 2015-12-12 03:50:11 -08:00
Rob Nelson
781627c756 Merge pull request #6943 from unid15/hunger_games
Adds "hardcore mode" that, when enabled, makes starvation kill
2015-12-12 03:24:10 -08:00
Rob Nelson
285fd5112f Merge pull request #6972 from 9600bauds/letsgivealuminumtoassistantswhatcouldpossiblygowrong
Fixes #6826, fixes #6969
2015-12-12 03:23:05 -08:00
Rob Nelson
f4e390b71b Merge pull request #6980 from clusterfack/specialtab
Special Tab
2015-12-12 03:22:37 -08:00
clusterfack
86d81499e9 Special Tab
Fucking special tab.

Forces special tab to be selected and opened when a non-admin with the special tab setting on receives an adminpm.
2015-12-12 03:48:33 -06:00
9600bauds
2f5587edf6 "k" - winston churchill 2015-12-12 00:17:32 -03:00
9600bauds
9b6ded03b1 Proper fix 2015-12-11 23:00:32 -03:00