Commit Graph

25341 Commits

Author SHA1 Message Date
TalkingCactus
0b21154be4 Lavaland Lag Fix (#51)
lavaland lag fix
motion trackers
salvaging hardsuits
2016-09-22 06:57:19 -04:00
TalkingCactus
829604cdb8 rewrite, clarifications (#49) 2016-09-19 19:42:00 -04:00
Poojawa
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
Poojawa
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
TalkingCactus
a715f6299b Gamemode Vote in the Lobby (#46)
* ;^)

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

* readded shuttle autocall
2016-09-18 13:04:47 -04:00
Matthew
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
unusualcrow
85cd936712 Tweaks! (#44) 2016-09-17 22:55:06 -04:00
TalkingCactus
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
TalkingCactus
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
LetterJay
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
Poojawa
4a58a0379a Merge pull request #30 from Poojawa/bob-barker
Bob Barker lessons
2016-09-04 07:35:30 -05:00
Poojawa
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
TalkingCactus
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
LetterJay
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
TalkingCactus
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
TalkingCactus
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
TalkingCactus
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
TalkingCactus
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
TalkingCactus
1edc9b8131 fixes mutant colors 2 and three not saving 2016-08-27 10:51:16 -04:00
TalkingCactus
6589428077 cargo bay piping fix 2016-08-26 07:53:51 -04:00
TalkingCactus
b78b39c628 condensation 2016-08-26 05:05:58 -04:00
TalkingCactus
d7080fb788 testing this template thing 2016-08-26 05:02:43 -04:00
TalkingCactus
2367f9e547 light it up like it's dynamite 2016-08-26 05:02:33 -04:00
TalkingCactus
9c58a74d13 defines kegs 2016-08-25 05:37:12 -04:00
TalkingCactus
fd22cdd24d Revert "defines the area and adds the blank map"
This reverts commit 1b5e674490.
2016-08-24 18:47:02 -04:00
TalkingCactus
1b5e674490 defines the area and adds the blank map 2016-08-24 18:46:49 -04:00
Poojawa
599bcd42c0 Merge branch 'master' of https://github.com/Poojawa/Citadel-Station-13-6th-Port 2016-08-24 02:26:12 -05:00
Poojawa
bf564fe1f8 Merge pull request #1 from Citadel-Station-13/master
sync
2016-08-24 02:26:33 -05:00
Poojawa
1272a2ea72 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' 2016-08-24 02:26:08 -05:00
TalkingCactus
e92285b519 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' 2016-08-23 23:01:37 -04:00