Commit Graph
67 Commits
Author SHA1 Message Date
CitadelStationBotandTalkingCactus c38fa1eaa3 Finally kills off my old nemesis of the old fashioned inconsistent shuttle paths (#410) 2017-04-15 15:01:54 -04:00
Cw 3040andTalkingCactus 07303ebcc6 Maint-Bar Fixes (#366)
* Map Fix

Why do I even bother living?

* Tweak pt2
2017-04-15 08:46:33 -04:00
PoojawaandGitHub 9e72b1b8fd /tg/ 4/14 (#367)
* outside code stuff

* defines, helpers, etc

* everything not module

* modules

* compiled fixes + missing sounds
2017-04-14 23:28:04 -05:00
PoojawaandGitHub 7e9b96a00f April sync (#360)
* Maps and things no code/icons

* helpers defines globalvars

* Onclick world.dm orphaned_procs

* subsystems

Round vote and shuttle autocall done here too

* datums

* Game folder

* Admin - chatter modules

* clothing - mining

* modular computers - zambies

* client

* mob level 1

* mob stage 2 + simple_animal

* silicons n brains

* mob stage 3 + Alien/Monkey

* human mobs

* icons updated

* some sounds

* emitter y u no commit

* update tgstation.dme

* compile fixes

* travis fixes

Also removes Fast digest mode, because reasons.

* tweaks for travis Mentors are broke again

Also fixes Sizeray guns

* oxygen loss fix for vore code.

* removes unused code

* some code updates

* bulk fixes

* further fixes

* outside things

* whoops.

* Maint bar ported

* GLOBs.
2017-04-13 23:37:00 -05:00
Cw 3040 6d8fbd3149 Minor Tweaks
Tweaked maintbar some more.
2017-04-01 16:58:19 -04:00
Cw 3040 1eb8ea1f51 Wire Fix 2017-04-01 15:06:09 -04:00
Cw 3040 70d716d4b8 Forgotten Fix
Cobweb removed
2017-04-01 14:59:12 -04:00
Cw 3040 cf90cb56ac Requested fixes
Improved upon the maintenance bar, and included fixes TalkingCactus
outlined.
2017-04-01 12:16:55 -04:00
Cw 3040 b33d1b1bbc The REAL fix 2017-03-31 11:21:59 -04:00
Cw 3040 99d360f5a2 Revert "Fix 1"
This reverts commit 528372396c.
2017-03-31 11:17:27 -04:00
Cw 3040 528372396c Fix 1 2017-03-31 11:14:18 -04:00
Cw 3040 3e01fdacd2 Revert "Change pt2"
This reverts commit 4494019f0d.
2017-03-31 11:11:13 -04:00
Cw 3040 4494019f0d Change pt2
Lowering amount of windows, tinting those that remain.
2017-03-31 06:33:57 -04:00
Cw 3040 4dd23a0940 Minor Edits to Box
Added larger maint bar, converted smaller maint bar to a storage room.
Pic related: http://i.imgur.com/iQR2aYG.png
2017-03-31 05:53:35 -04:00
LetterJay d21d9fc854 map fix 2017-03-27 16:22:41 -05:00
TalkingCactusandGitHub 756180afd6 Automatic MC Re-Starter 9000 (#319)
* fixed runtime in air.dm

fix was made in LINDA_turf_tile.dm though

* fixes runtime in corpse.dm

* fixes runtime in species.dm

* automatically restarts the MC sometimes

When the timer SS crashes, here's the fix

hardcoded with love

* supermatter area icon

* better admin logs

* better mentorhelp message for admins

* fixes map
2017-03-27 03:16:56 -04:00
LetterJay e385849d72 hotfix for map 2017-03-26 12:35:12 -05:00
TalkingCactusandGitHub c997ebcabd Removes Lag (tm) (#313)
* sensible fixes

* this too

* some more

* fixes chair icons

reverted to state before tg pull

* fixes telecomms icons

revert to state before tg pull

* fixes research icons

reverted to before tg pull

* de-whitewashed the stools

* fixed missing broadcaster sprites

* always load from the savefile

helps custom servers who don't want to fuck with the config, this will
never not be wanted with the system we have

* stop it, ghosts

* fixes limb augmentation

https://github.com/tgstation/tgstation/pull/25446

* removes lag

* re-adds sounds

* exception

* makes travis happy
2017-03-26 09:39:29 -04:00
LetterJay e07580413f fuck 2017-03-24 02:08:02 -05:00
LetterJay 1d518bb4dd updates maploader, fixes a few things 2017-03-24 01:39:11 -05:00
PoojawaandGitHub 7ad5e22830 Wew lad (#305)
* not code stuff

* other things

* global vars, defines, helpers

* onclick hud stuff, orphans, world.dm

* controllers and datums

* game folder

* everything not client/mobs in modules

* client folder

* stage 1 mob stuff

* simple animal things

* silicons

* carbon things

* ayylmaos and monkeys

* hyoomahn

* icons n shit

* sprite fixes

* compile fixes

* some fixes I cherrypicked.

* qdel fixes

* forgot brain refractors

* based cyberboss.

* you'd think github would suck less.

* vendors

* tweaks and specialty vendors.

* map things

* go away shitty omega

* qdeletion spam supress, maps.txt tweaks

* shuttle lights
2017-03-22 02:55:33 -05:00
PoojawaandGitHub f67e9f6d87 Bleeding edgy refresh (#303)
* not code stuff

* other things

* global vars, defines, helpers

* onclick hud stuff, orphans, world.dm

* controllers and datums

* game folder

* everything not client/mobs in modules

* client folder

* stage 1 mob stuff

* simple animal things

* silicons

* carbon things

* ayylmaos and monkeys

* hyoomahn

* icons n shit

* sprite fixes

* compile fixes

* some fixes I cherrypicked.

* qdel fixes

* forgot brain refractors
2017-03-21 11:44:10 -05:00
Leon-Leonardo e79f328158 delete old maps 2017-03-19 23:11:50 -04:00
Leon-Leonardo 56d95c0770 citadel.1.2.1
replaced the base turf of all the outside asteroid sand with the right
turf, hopefully this fixes the hang on loading
replaced all the maint loot spawns with the vanilla one
fixed the area for the lavaland shuttle
fixed the wooden tables of the bar and maint bar
added vents and scrubbers to the port hallway
added firelocks where they were missing
2017-03-19 18:24:25 -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
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 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 b4c2d2ad24 make it stop 2017-03-14 19:25:24 -05:00
LetterJay 128557ed24 oops 2017-03-14 17:44:38 -05:00
LetterJay 34106df7ef map edits 2017-03-14 16:48:38 -05:00
LetterJay d07a217578 removes dupes of old map versions 2017-03-14 16:28:08 -05:00
Leon-LeonardoandGitHub 1d2c3635fc Merge branch 'master' into citadel.1.0.2 2017-03-14 13:55:53 -04:00
Leon-Leonardo a8565da849 Citadel Station v1.0.2 2017-03-14 13:52:14 -04:00
Leon-LeonardoandPoojawa 6be091e40a Citadel.1.0.1 (#275)
* Adds Citadel Station to the game (finally).

Version 0.9.0

* Citadel Station v0.9.1

* Citadel Station v1.0.0

* citadelstation.1.0.1
2017-03-14 04:37:38 -05:00
Leon-Leonardo 1fdf69d765 citadelstation.1.0.1 2017-03-14 02:22:33 -04:00
Leon-Leonardo 3bb33103fc Citadel Station v1.0.0 2017-03-13 02:42:21 -04:00
Leon-Leonardo 4f7355a6af Citadel Station v0.9.1 2017-03-12 20:20:57 -04:00
PoojawaandGitHub 83e55e41d1 engine revert (#273) 2017-03-12 04:43:24 -05:00
Leon-Leonardo 24ca0aeffd Adds Citadel Station to the game (finally).
Version 0.9.0
2017-03-11 22:58:48 -05:00
TalkingCactusandGitHub 3a1d69cc63 Fixes Lattice Building (#263)
* allows construction of lattices again

https://github.com/tgstation/tgstation/pull/24674

* removes stray brig shutter from engineering windows
2017-03-05 06:51:18 -05:00
Mr Potato ShamanandTalkingCactus 849f216c49 Fix DIR for Waste Loop O2 Gas Filter in Atmo (#261) 2017-03-03 23:16:46 -05:00
TalkingCactusandGitHub 7023a22d61 Fixes Icons and Map (#253)
* reverts research.dmi overwrite

adds bluespace material insertion

* reverts kitchen.dmi overwrite

included idle light for grinder

* de-whitewashed stools

* fixes laser carbine design

THE PINS

* fixes maint bar and most of the cams

* dmm2tgm
2017-02-28 14:02:08 -05:00
PoojawaandGitHub 0bca862419 Overhauls and 2/28 sync (#244)
* map tweaks/shuttle engines

* helpers and defines

* global/onclick

* controllers and datums

* mapping

* game folder

* some other stuff

* some modules

* modules that aren't mobs

* some mob stuff

* new player stuff

* mob living

* silicon stuff

* simple animal things

* carbon/ayylmao

* update_icons

* carbon/human

* sounds and tools

* icons and stuff

* hippie grinder changes + tgui

* kitchen.dmi

* compile issues fixed

* mapfix

* Mapfixes 2.0

* mapedit2.0

* mapmerger pls

* Revert "mapedit2.0"

This reverts commit 74139a3cacea10df7aafca06c0a10bd3daf3a481.

* clean up vore folder + 2 hotfixes

* admin ticket refinement

* Blob tweaks and LAZYADD

* LAZYADD IS LAZY

* Magic strings purged

* DEFINES NEED HIGHER PRIORITIES

* Only a sleepless idiot deals in absolute TRUE|FALSE

* u h g

* progress bar fix

* reverts ticket logs

* there's always that one guy

* fixes and stuff

* 2/27 fixes

* game folder stuff

* stats

* some modules again

* clothing stuff

gets vg clothing out of the main files

* everything not mobs again

* mob stuff

* maps, tgui, sql stuff

* icons

* additional fixes and compile errors

* don't need this anymore

* Oh right this isn't needed anymore

* maint bar re-added

* that doesn't need to be here

* stupid events

* wtfeven

* probably makes Travis happy

* don't care to fix the grinder atm

* fixes vending sprites, changes turret

* lethal, not lethals

* overylays are finicky creatures

* lazy fix for bleeding edgy (#252)

* map tweaks/shuttle engines

* helpers and defines

* global/onclick

* controllers and datums

* mapping

* game folder

* some other stuff

* some modules

* modules that aren't mobs

* some mob stuff

* new player stuff

* mob living

* silicon stuff

* simple animal things

* carbon/ayylmao

* update_icons

* carbon/human

* sounds and tools

* icons and stuff

* hippie grinder changes + tgui

* kitchen.dmi

* compile issues fixed

* mapfix

* Mapfixes 2.0

* mapedit2.0

* mapmerger pls

* Revert "mapedit2.0"

This reverts commit 74139a3cacea10df7aafca06c0a10bd3daf3a481.

* clean up vore folder + 2 hotfixes

* admin ticket refinement

* Blob tweaks and LAZYADD

* LAZYADD IS LAZY

* Magic strings purged

* DEFINES NEED HIGHER PRIORITIES

* Only a sleepless idiot deals in absolute TRUE|FALSE

* u h g

* progress bar fix

* reverts ticket logs

* there's always that one guy

* fixes and stuff

* 2/27 fixes

* game folder stuff

* stats

* some modules again

* clothing stuff

gets vg clothing out of the main files

* everything not mobs again

* mob stuff

* maps, tgui, sql stuff

* icons

* additional fixes and compile errors

* don't need this anymore

* Oh right this isn't needed anymore

* maint bar re-added

* that doesn't need to be here

* stupid events

* wtfeven

* probably makes Travis happy

* don't care to fix the grinder atm

* fixes vending sprites, changes turret

* lethal, not lethals

* overylays are finicky creatures
2017-02-28 09:30:49 -06:00
TaxMasterandTalkingCactus a5e688b25d Adds Kinkmate back into the server (#231)
* Adds in clothing from the /vg/ rip

* adds clothing from the /vg/ rip

* Adds in the kinkmate back in.

Its fairly barebones at the moment, cause dildo/onahole code is getting
ported.

Shoutouts to Cactus for literally giving me the code over discord.

* a

a

* Fixed stuff

Made the vending code more in-line with the citadel master and fixed the
gitignore.

* Fixes up the vending_items

Also adds dog collars to the contraband section to the kinkmate.

* A learning experience

Why did TG making map coding so difficult, anyway?

* aaaaaa

I hate life sometimes.
2017-02-16 19:59:45 -05:00
PoojawaandGitHub fc2dbcd9fe Tg port 2 15 (#230)
* defines/helpers

* globalvars, onclick, controllers

* datums and game

* woooooooooorld. Uh. dm

* modules sans mobs client admin

* modules/admin

* pref shit

* modules/mob

* icon updates

* extra things

* Cherrypicked fixes from open PRs

* metastation.tgm fix

* a better meta fix

* reverts async breakings
2017-02-15 03:35:32 -06:00
PoojawaandGitHub 6674f9fc15 Tg 2 11 sync (#215)
* first series of updates

* datums

* games folder

* admin and atmosia stuffs

* moar

* mob updates borg riding

* sprites and stuff

* fixes for various things

* oops. some missed fixes
2017-02-12 03:56:14 -06:00
TalkingCactusandGitHub 30b3dff395 Adds Maintenance Bar+ (#212) 2017-02-12 04:52:15 -05:00
PoojawaandGitHub 449614df96 Actually cleans up un-needed files. (#210)
* actually gets rid of excess files

* obsolete admin files
2017-02-08 22:35:56 -06:00
Poojawa 3f8df133d8 other things I missed 2017-02-08 00:49:31 -06:00