Commit Graph
203 Commits
Author SHA1 Message Date
L.E.DandTalkingCactus cd91d2d9ce New Title Screen Music & Splashscreens (#72)
* music

* hsghberhbnsrh

* k

* i like this better

* fugoff leon

* oops

* afgegwsrgvewsrg
2016-11-25 14:14:38 -05:00
katnepandTalkingCactus 094d767111 Nanomed plus changes + lasers are cauteries now (#71)
* Cautery update

you can now cauterize with a laser gun now

* Added some stuff

Added some stuff the the nano vend
3 epinephrine medipens
1 box of hugs
3 medical belts
1 medical wrench

* Did the thing

Changed the thing you asked for to be changed
2016-11-20 20:39:20 -05:00
L.E.DandTalkingCactus c3972ad738 Space Parallax Port (#69)
* better

* what the fuck

* Revert "what the fuck"

This reverts commit 384d5b33aacaf9c67be2c8c089979b9ee6b41074.

* chrwedrhbedrhbnedrh

* it works ? ? ?

* shutte

* prefs

* i think i did it right

* kk
2016-11-11 14:49:19 -05:00
L.E.DandTalkingCactus 563c51ff70 Lighting fix (#68)
* f i x

* nah
2016-11-06 12:22:32 -05:00
L.E.DandTalkingCactus e1956df149 Glorious /vg/ Lighting Port (#66)
* fuck

* [CANT WAKE UP]

* AAAAAAAAAHHHHHHHHHHHH

* SAAAAVE MEEEEEEEEEEEEEEEE

* this is so bad how can i even call myself a coder

* thanks fam

* hello darkness my old friend

i've come to talk with you again

* ugh go away

* OH

* much less broken

* ayy

* aaaaa

* OH YEAAAAAAAAHHHHHHHHHHH

* aaaa

* k

* dfgjtxkytkjyd

* debug

* dangerously cheesy

* mm

* OH YEAAAAAAAAAAAAAAAAAAAAAAAAAA

* oH YEAH

* Some final touches and cleanup of the lighting port.

* One more

* More fixes.

* varedit hack for easy modification

* fixed

* C O L O R

* slym

* fffff

* oh great what the fuck is wrong now

* Revert "oh great what the fuck is wrong now"

This reverts commit e589ad51facb5464e107ca515317d41136dd1e5e.

* fu

* will it blend

* aaaaaaaaaaaaaaaaaaaa

* this is why im bad at porting

falalalala, lala la la

* k

* yeh

* can't forget majestic fire
2016-11-06 09:51:16 -05:00
Somebody once told me the world is gonna roll me; I ain't the sharpest tool in the shed. She was looking kind of dumb with her finger and her thumb in the shape of an "L" on her foreheadandTalkingCactus 9b07cb4798 Ports n' Stuff (#65)
* baykun

* spooky lavaland music

* deserted sound +  burger fix

* powertools

* forgot

* ex d

* atom support

* Revert "atom support"

This reverts commit 5c9790bfef97b3a5b3bf324950de6cbe91af71d9.

* ignore atom file for my setup

* oh whoops xd
2016-10-29 22:13:30 -04:00
katnepandTalkingCactus c78fddcf13 New kits (#61)
* my fulton changes

fulton rework to make them worth getting

* Fulton rework adjustments

fixed the spelling error and edited the description to reflect the fact
you can move people

* SURVIVAL BUNDLES

survival bundles which are basically just stimpack bundles but with
survival pens instead of stimpacks

* survival kit

raised the price to 1000

* few more items

ok a few things
added a survival knife to the mining vendor i don't need to tell you how
annoying it is to lose your knife. for 300 points

survival kit, containing 3 medpens, 2 survival pods, a survival knife,
and a whetstone for 1250 points

and a whetstone for 1000

* Removed the equipment package

it was pretty much unnecessary and probably OP when you can get a
literal spacesuit for almost the same

* medipens

medipens now cost 600 points because fuck being able to afford like 3 of
these 15 minutes in
the medipen bundle now costs 1500, and is renamed to Survival medipen
bundle

* making the bundle super priced

bundle price now 2000
2016-10-11 09:34:53 -04:00
TalkingCactusandGitHub 1a25e96385 Races Continued (#33) 2016-10-11 08:14:44 -04:00
PoojawaandGitHub 7f57882022 Pokemans and plant bags o holding (#57)
* sync (#3)

* shuttle auto call

* Merge /vore into /master (#39)

* progress

* Compile errors fixed

No idea if it's test worthy tho as conflicts with race overhaul and
narky removal.

* Update admins.txt

* efforts continue

Fuck grab code, seriously

* grab code is cancer

* Execute the Narkism

Do not hesitate.

Show no mercy.

* holy shit grab code is awful

* have I bitched about grab code

My bitching, let me show you it

* código de agarre es una mierda

No really it is

* yeah I don't even know anymore.

* Lolnope. Fuck grab code

* I'm not even sure what to fix anymore

* Self eating is not an acceptable fate

* Taste the void, son.

* My code doesn't pass it's own sanity check.

Maybe it's a sign of things to come.

* uncommented and notes

* It Works and I Don't Know Why (#38)

* shuttle auto call

* it works and I don't know why

* pokemans and plant hoarding
2016-09-25 03:40:22 -05:00
PoojawaandGitHub 4a51c6884f Admin logging (#53)
* sync (#3)

* shuttle auto call

* Merge /vore into /master (#39)

* progress

* Compile errors fixed

No idea if it's test worthy tho as conflicts with race overhaul and
narky removal.

* Update admins.txt

* efforts continue

Fuck grab code, seriously

* grab code is cancer

* Execute the Narkism

Do not hesitate.

Show no mercy.

* holy shit grab code is awful

* have I bitched about grab code

My bitching, let me show you it

* código de agarre es una mierda

No really it is

* yeah I don't even know anymore.

* Lolnope. Fuck grab code

* I'm not even sure what to fix anymore

* Self eating is not an acceptable fate

* Taste the void, son.

* My code doesn't pass it's own sanity check.

Maybe it's a sign of things to come.

* uncommented and notes

* It Works and I Don't Know Why (#38)

* shuttle auto call

* it works and I don't know why

* Admin ticket system

* admin rights
2016-09-24 22:44:17 -05:00
TalkingCactusandGitHub f230203564 spacedrift (#55) 2016-09-23 21:24:58 -04:00
PoojawaandGitHub d15016386f Doge calibrations (#54)
* sync (#3)

* shuttle auto call

* Merge /vore into /master (#39)

* progress

* Compile errors fixed

No idea if it's test worthy tho as conflicts with race overhaul and
narky removal.

* Update admins.txt

* efforts continue

Fuck grab code, seriously

* grab code is cancer

* Execute the Narkism

Do not hesitate.

Show no mercy.

* holy shit grab code is awful

* have I bitched about grab code

My bitching, let me show you it

* código de agarre es una mierda

No really it is

* yeah I don't even know anymore.

* Lolnope. Fuck grab code

* I'm not even sure what to fix anymore

* Self eating is not an acceptable fate

* Taste the void, son.

* My code doesn't pass it's own sanity check.

Maybe it's a sign of things to come.

* uncommented and notes

* It Works and I Don't Know Why (#38)

* shuttle auto call

* it works and I don't know why

* pixel issue resolved

Damnifino. It seems to work.

* fixes attack runtime

* Sleeper UI refresh

Also has tgui framework TBF
2016-09-23 04:49:06 -05:00
TalkingCactusandGitHub 0b21154be4 Lavaland Lag Fix (#51)
lavaland lag fix
motion trackers
salvaging hardsuits
2016-09-22 06:57:19 -04:00
TalkingCactusandGitHub 829604cdb8 rewrite, clarifications (#49) 2016-09-19 19:42:00 -04:00
PoojawaandGitHub 84f7d4dc23 robopuppy typo (#48)
* sync (#3)

* shuttle auto call

* Merge /vore into /master (#39)

* progress

* Compile errors fixed

No idea if it's test worthy tho as conflicts with race overhaul and
narky removal.

* Update admins.txt

* efforts continue

Fuck grab code, seriously

* grab code is cancer

* Execute the Narkism

Do not hesitate.

Show no mercy.

* holy shit grab code is awful

* have I bitched about grab code

My bitching, let me show you it

* código de agarre es una mierda

No really it is

* yeah I don't even know anymore.

* Lolnope. Fuck grab code

* I'm not even sure what to fix anymore

* Self eating is not an acceptable fate

* Taste the void, son.

* My code doesn't pass it's own sanity check.

Maybe it's a sign of things to come.

* uncommented and notes

* It Works and I Don't Know Why (#38)

* shuttle auto call

* it works and I don't know why

* Dogborg ports

sans pleasure borg.

Defib paws I think work, but not with basic battery. sleeper mod works

* oops
2016-09-19 04:13:50 -05:00
PoojawaandGitHub e90d06914c Robopuppies (#47)
* sync (#3)

* shuttle auto call

* Merge /vore into /master (#39)

* progress

* Compile errors fixed

No idea if it's test worthy tho as conflicts with race overhaul and
narky removal.

* Update admins.txt

* efforts continue

Fuck grab code, seriously

* grab code is cancer

* Execute the Narkism

Do not hesitate.

Show no mercy.

* holy shit grab code is awful

* have I bitched about grab code

My bitching, let me show you it

* código de agarre es una mierda

No really it is

* yeah I don't even know anymore.

* Lolnope. Fuck grab code

* I'm not even sure what to fix anymore

* Self eating is not an acceptable fate

* Taste the void, son.

* My code doesn't pass it's own sanity check.

Maybe it's a sign of things to come.

* uncommented and notes

* It Works and I Don't Know Why (#38)

* shuttle auto call

* it works and I don't know why

* Dogborg ports

sans pleasure borg.

Defib paws I think work, but not with basic battery. sleeper mod works
2016-09-19 01:03:31 -05:00
TalkingCactusandGitHub a715f6299b Gamemode Vote in the Lobby (#46)
* ;^)

* auto gamemode vote in the lobby
2016-09-18 13:05:23 -04:00
unusualcrowandTalkingCactus 24c10b1b7f New Content Update (#43)
* New Content Update

* readded shuttle autocall
2016-09-18 13:04:47 -04:00
MatthewandTalkingCactus 8a9bbcf97d Engineering Suit storage Magboots. (#45)
* Add files via upload

* Delete suit_storage_unit.dm

* Add files via upload

fixed the Magboots in engineering

* Added Secure storage button for normal engineers
2016-09-18 13:02:37 -04:00
unusualcrowandTalkingCactus 85cd936712 Tweaks! (#44) 2016-09-17 22:55:06 -04:00
TalkingCactusandGitHub b5e3121d3a Map Fixes (#42)
* cargo bay APC and blood bags

blood bags added to the surgery room
cargo bay APC is now actually in the cargo bay area, should work now

* construction site

* converts box back to tgm from dmm

for whatever reason
2016-09-16 11:04:26 -04:00
TalkingCactusandPoojawa 9d9a93335b Merge /vore into /master (#39)
* progress

* Compile errors fixed

No idea if it's test worthy tho as conflicts with race overhaul and
narky removal.

* Update admins.txt

* efforts continue

Fuck grab code, seriously

* grab code is cancer

* Execute the Narkism

Do not hesitate.

Show no mercy.

* holy shit grab code is awful

* have I bitched about grab code

My bitching, let me show you it

* código de agarre es una mierda

No really it is

* yeah I don't even know anymore.

* Lolnope. Fuck grab code

* I'm not even sure what to fix anymore

* Self eating is not an acceptable fate

* Taste the void, son.

* My code doesn't pass it's own sanity check.

Maybe it's a sign of things to come.

* uncommented and notes

* It Works and I Don't Know Why (#38)

* shuttle auto call

* it works and I don't know why
2016-09-09 23:31:01 -05:00
LetterJayandGitHub 315c5a4a4e Merge pull request #36 from LetterJay/master
shuttle auto call
2016-09-06 04:48:07 -04:00
LetterJay ba0326df85 shuttle auto call 2016-09-06 03:45:28 -05:00
PoojawaandGitHub 4a58a0379a Merge pull request #30 from Poojawa/bob-barker
Bob Barker lessons
2016-09-04 07:35:30 -05:00
PoojawaandGitHub 0a2fd60520 Science nerfs (#28)
* Because No

* Okay not as much no this time

* Cargo is impossible to nerf
2016-09-04 07:34:46 -05:00
TalkingCactusandGitHub b004fd6db1 Merge pull request #31 from TalkingCactus/master
Fixes Some Active Turfs from Ruins
2016-09-03 12:16:38 -04:00
Poojawa 0578a0a122 Based Barker 2016-09-02 08:08:18 -05:00
Poojawa ca4d90072a Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' 2016-09-02 07:54:14 -05:00
TalkingCactus 24b3e10d7c second batch of AT fixes 2016-09-01 17:35:47 -04:00
TalkingCactus 6ff01a4b27 roundstart AT first batch 2016-09-01 16:37:21 -04:00
TalkingCactus 3fdf706248 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' 2016-08-31 20:02:24 -04:00
LetterJayandGitHub 4d0ba5a8c4 Merge pull request #29 from LetterJay/master
character save slots to 10 instead of 3
2016-08-31 17:21:30 -04:00
LetterJay f69cdb2d8e character save slots to 10 instead of 3 2016-08-31 03:23:07 -05:00
Poojawa 9b6fcc3e68 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' 2016-08-30 20:43:21 -05:00
TalkingCactus f8c3d4b9ba Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' 2016-08-30 21:39:47 -04:00
TalkingCactus 02aa672673 alien death rattle 2016-08-30 17:14:08 -04:00
TalkingCactusandGitHub 2d095a2ee5 Merge pull request #27 from TalkingCactus/master
Makes ListTargets() much much faster.
2016-08-30 14:29:02 -04:00
TalkingCactus ad389d11e4 missed a part 2016-08-30 14:14:12 -04:00
TalkingCactus 058095b2f5 ports https://github.com/tgstation/tgstation/pull/19981
Special thanks to MrStonedOne.
2016-08-30 14:13:55 -04:00
TalkingCactus 37644b7109 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' 2016-08-30 13:53:46 -04:00
TalkingCactusandGitHub 5dfd4e9224 Merge pull request #26 from TalkingCactus/master
Fixes Flavor Text Not Saving/Displaying Correctly
2016-08-28 08:28:43 -04:00
TalkingCactus ea55a53a99 fixes flavor text not saving/displaying correctly 2016-08-28 08:26:50 -04:00
TalkingCactus bc0e10ce4c Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' 2016-08-27 19:30:16 -04:00
TalkingCactusandGitHub 47e8acae14 Merge pull request #25 from TalkingCactus/master
Re-Adds the LOOC Verb
2016-08-27 19:19:25 -04:00
TalkingCactus 1d34ccd1f8 adds back the LOOC verb
verb was lost in the narky genocide
2016-08-27 19:17:09 -04:00
TalkingCactus 88507cacdd Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' 2016-08-27 14:07:30 -04:00
TalkingCactusandGitHub 15e9696eee Merge pull request #24 from TalkingCactus/master
Fixes Mutant Colors Not Saving
2016-08-27 12:01:04 -04:00
TalkingCactus 6c710d9d7e indentation fix 2016-08-27 10:58:19 -04:00
TalkingCactus 10374f9cb5 makes upgraded industrial welding tools slightly larger 2016-08-27 10:58:05 -04:00