Commit Graph

462 Commits

Author SHA1 Message Date
LetterJay e149bde2bb Update tgstation.dme 2017-03-19 14:41:33 -05:00
LetterJay f17cd76618 Merge pull request #296 from LetterJay/master
'Give' verb
2017-03-19 15:39:01 -04:00
LetterJay d54562b707 fix changelogs/Jay-PR-296.yml 2017-03-19 14:33:20 -05:00
LetterJay 9aa076b316 changelogs/Jay-PR-296.yml 2017-03-19 14:00:41 -05:00
LetterJay 3e294af826 'Give' verb 2017-03-19 13:57:12 -05:00
LetterJay 1675d24d71 Merge pull request #282 from katnep/CQC-remastered
Cqc remastered
2017-03-19 08:42:08 -04:00
LetterJay d843837abf Merge pull request #270 from TalkingCactus/JMP-n-STUFF
Improved Atmospherics Logging
2017-03-18 23:42:11 -04:00
LetterJay 03ee579f5e Merge pull request #295 from Verkister/master
It's been a long day okay :v
2017-03-18 23:36:02 -04:00
Verkister dc18472d72 It's been a long day okay :v 2017-03-19 02:20:04 +02:00
LetterJay 6df2e787cd Merge pull request #294 from Verkister/master
Stealing overlay fix from tg.
2017-03-18 20:10:33 -04:00
Verkister 1a284fc66d Goddamnit how in the hell did I manage to forget both new wagtails behind views. 2017-03-19 02:05:44 +02:00
Verkister 98cb8767b5 Stealing overlay fix from tg.
Also forgot one tailwag sprite last time.
2017-03-19 01:46:56 +02:00
LetterJay cf5a0185b2 Merge pull request #292 from Leon-Leonardo/citadel1.2.0
Citadel Station 1.2.0
2017-03-18 14:38:49 -04:00
LetterJay 1927feddf3 Merge pull request #293 from Verkister/master
New attempt at fixing shit. Also some sprite stuff.
2017-03-18 14:38:35 -04:00
Verkister 62705e87f6 git is being a butt again 2017-03-18 14:10:14 +02:00
Verkister df8d69535b New attempt at fixing shit. Also some sprite stuff.
-Messed around with another air proc I saw runtiming on server.
-Attempted to fix overlays even further. Test run successful but you never know with random chances that hopefully are now as low as the test run let me see.
-Meddled around with transit space. 2 directions were missing a corrective step against negative rng output.
-Added otie snouts.
-Improved contrast in the corvid markings.
-Added tail wag sprites for husky and otie.
2017-03-18 14:08:10 +02:00
Verkister 00b7dce512 Merge branch 'master' into master 2017-03-18 12:05:51 +02:00
Verkister 81956b0502 Inhand overlays fixed.
Whoa this succeeded on the first try unlike yesterday's crap :v
2017-03-18 12:02:50 +02:00
Verkister edc44b2cc5 Overlay fix for the inhand borkage.
Whoa this thing actually succeeded on the first time unlike yesterday's shit :v
2017-03-18 11:59:03 +02:00
Leon-Leonardo e357748da3 Update citadelstation.dm 2017-03-18 02:39:13 -04:00
Leon-Leonardo fcb52a6893 added teleporter room
added tracking beacons
added EVEN MORE to maint and made it the standard deathtrap
added carp spawns
added more tunnels to the asteroid exterior
fixed secure workstations access
fixed some fudged wires
fixed some fudged areas
fixed a couple fudged APC's
added plant DNA manipulator
lowered the security of the CMO, RD, and CE offices
added arcade machines
added status displays to cargo
fixed Civ Armory access (for real this time)
reworked the bar/kitchen/casino area
gave the Kinkmate a home
added windows to EVA
2017-03-18 00:57:11 -04:00
LetterJay 3f29a01970 Merge pull request #291 from Citadel-Station-13/revert-286-revert-284-revert-281-master
Revert "Little but possibly hella important fixes"""
2017-03-17 23:54:21 -04:00
LetterJay 9ce20fae93 Revert "Revert "Revert "Little but possibly hella important fixes""" 2017-03-17 22:44:45 -05:00
LetterJay 646c0c245d Merge pull request #290 from Citadel-Station-13/revert-289-master
Revert "Overlay fix"
2017-03-17 23:44:07 -04:00
LetterJay e41e97a9e9 Revert "Overlay fix" 2017-03-17 22:43:41 -05:00
LetterJay e4a33fa115 Merge pull request #289 from Verkister/master
Overlay fix
2017-03-17 21:20:45 -04:00
Verkister 3e2cf6ec14 Overlay fix
This took way too long lmao.
Also manually edited the file in github since doing anything the right way is a goddamn shitfest on this system :v
2017-03-17 20:13:34 +02:00
LetterJay f2937205ac Merge pull request #286 from Verkister/revert-284-revert-281-master
Revert "Revert "Little but possibly hella important fixes""
2017-03-16 18:10:42 -04:00
Verkister 8f3d97291a Merge branch 'master' into revert-284-revert-281-master 2017-03-16 23:57:37 +02:00
LetterJay 56801458e4 Merge pull request #285 from Leon-Leonardo/citadel.1.1.0
Citadel.1.1.0
2017-03-16 17:52:26 -04:00
LetterJay a80dae3843 Merge pull request #287 from Verkister/master
Another attempt at fixing air.dm
2017-03-16 17:49:09 -04:00
Verkister 2158168a4a Merge branch 'master' into master 2017-03-16 09:22:32 +02:00
Verkister 545dec9826 Revert "Revert "Little but possibly hella important fixes"" 2017-03-16 09:14:53 +02:00
Verkister 429e101e5d Another attempt at fixing air.dm
I found out the process_cell proc did exist, but it's for turfs only. The runtiming call for it had no proper exclusion. No idea if this works, but the test runs showed no problems so far.
2017-03-16 09:03:18 +02:00
Leon-Leonardo e62453275c fixed inaccessible chemmaster in chemistry
moved hydroponics, replaced it with a Casino
added Ian and spare ID's/PDA's to HoP office
fixed the security of the Civ armory
added cameras to bridge airlocks
fixed CE office APC
added some redundant powerlines
added airlock to R&D entrance
fixed stacking machine in cargo and made it so you can put crates on the conveyor
added navbeacons for bots
added the auxiliary base
added escape pod 4
added the "near station" space area where appropriate
moved mining shuttle
2017-03-16 01:39:30 -04:00
LetterJay 4c1084327c Merge pull request #284 from Citadel-Station-13/revert-281-master
Revert "Little but possibly hella important fixes"
2017-03-15 21:20:42 -04:00
LetterJay ed435e7e2f Revert "Little but possibly hella important fixes" 2017-03-15 20:20:22 -05:00
LetterJay be00b14221 Merge pull request #281 from Verkister/master
Little but possibly hella important fixes
2017-03-15 21:02:12 -04:00
ktccd be0e52c2f0 Borer_chem_lewd_update (#276)
* Borer_chem_lewd_update

Added aphrodisiac and anaphrodisiac to the borer chemical list. Default
costs for now.

* Cloning-genitalia

Previously, clones had DNA for genitals, but not the organs. This should
give organs to any creature that has the DNA for them.

* Revert "Cloning-genitalia"

This reverts commit 67cac7775f1d8813638d3e77daaeed768822dfee.
2017-03-15 10:42:07 -04:00
Verkister 41d47301dd Separated the goddamn overlay direction quirk between mobs and turfs since apparently they both misused the same shit in a different way, conflicting like crap! 2017-03-15 13:52:39 +02:00
Verkister afb8d2a006 Fixes missing lizard front snouts using the shit-functional "FRONT" layer.
(our custom mammal snouts are all on ADJ layer and work just fine)
2017-03-15 11:30:52 +02:00
Verkister bb879dfac8 -Fixes overlay stuff such as character creation preview. (one of main runtime issues out there currently)
-Probably fixes a missing proc with air runtimes too, which has been one of the problemos appearing in tandem with MC borkage (next line under was MC related anyway)
-Husky tail wag sprites renamed correctly (inverted color order). Actual movement yet to come.
2017-03-15 10:52:00 +02:00
Leon-Leonardo de1fe1e2f1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2017-03-15 00:37:01 -04:00
Leon-Leonardo d2d4f238ae Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' 2017-03-15 00:35:14 -04:00
LetterJay a4c1198b96 Merge pull request #280 from LetterJay/master
Map tweaks for Citadel
2017-03-14 22:41:14 -04:00
LetterJay 45f9c18425 pixels. PIXELS! 2017-03-14 19:47:49 -05:00
LetterJay 6585fbf470 over the rainbow 2017-03-14 19:38:06 -05:00
LetterJay fd3be49cb4 one day 2017-03-14 19:29:29 -05:00
LetterJay b4c2d2ad24 make it stop 2017-03-14 19:25:24 -05:00
LetterJay 128557ed24 oops 2017-03-14 17:44:38 -05:00