Commit Graph

289 Commits

Author SHA1 Message Date
TalkingCactus
51d20e13ef Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into JMP-n-STUFF 2017-03-10 12:56:18 -05:00
TalkingCactus
09ec454325 Random Fixes + Dildos (#268)
* I'LL SNEAK THIS IN, TOO

* will it blend

* event tweaking

* new kinkmate sprite

* savefile bugfixes

* drinks got overwritten again

rip

* replaces missing styles

* dildos

* last bit
2017-03-10 12:51:16 -05:00
TalkingCactus
097557de4b do it better 2017-03-10 12:47:28 -05:00
TalkingCactus
906b8e59d0 disables flight suits, again (#265) 2017-03-06 16:59:57 -05:00
TalkingCactus
733ca2716d I'm retarded 2017-03-06 15:58:37 -05:00
TalkingCactus
2adf4e26c8 disables suicide
was overwritten in an update
2017-03-06 15:56:15 -05:00
TalkingCactus
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
TalkingCactus
89a87f6ee5 send it, captain (#262)
confirmation confirmed, sending package
2017-03-05 04:30:46 -05:00
LetterJay
f0ad0ac08b sql fix 2017-03-04 05:26:43 -06:00
TalkingCactus
97327d2beb Hotfixes for March 3, 2017 (#260)
* fixes sterile mask box

* fixes admin map templates

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

* syndicate beacon refactor

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

* singularity tracking

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

* puddle description

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

* aux base landing fix

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

* comms console cooldown

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

* cult fixes + pronouns

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

* minebots now check for pressure

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

* fixes a very annoying spawn

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

* fixes false positive AI cheat check

https://github.com/tgstation/tgstation/pull/24558
mso is bae

* Fixes abductor surgery designs

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

* Allows transit space shuttle repairs

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

* fixes indentation error
2017-03-03 15:15:42 -05:00
TalkingCactus
84578c35cd New Sounds for Emitters, Fire Alarms, Sparks, and Maintenance Ambience (#258)
* new sparks sound

* new emitter sound

* new maintenance sounds

* non-overlapping fire alarm sound

* volume tweaking
2017-03-03 00:53:17 -05:00
Poojawa
b26c52ebd2 Fixes vendies and glasses (#257) 2017-02-28 23:10:46 -06:00
Poojawa
768c644638 Reverts admin ticket system (#256)
* Reverts admin ticket system

Way too buggy right now.

* I guess dme is a thing
2017-02-28 23:10:37 -06:00
LetterJay
93fcc0d99f Merge pull request #255 from LetterJay/master
removes replace_text for them/their to his/her
2017-02-28 22:46:28 -05:00
LetterJay
cf680a63d2 changes most, if not all, the send2irc_adminless_only to send2irc 2017-02-28 21:40:52 -06:00
LetterJay
3480265efc reduce meteor chances as well as the chance for everything to fuck up if RNGesus does see it fit to damn you all. 2017-02-28 21:28:28 -06:00
LetterJay
42816f916c removes replace_text for them/their to his/her 2017-02-28 21:04:37 -06:00
TalkingCactus
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
Poojawa
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
TaxMaster
93782cf716 Adds VG weaponry to the server (#243)
* Adds in clothing from the /vg/ rip

* adds clothing from the /vg/ rip

* Adds VG weaponry to the server

Adds VG weaponry to the server, most of it is intended for the bussing
admin so its not obtainable normally.

This also adds in toy megabusters to the arcade machine toy list and two
vending machines intended for adminbus/events/thunderdome.

* aa

fixing even more shit

* aaa

*external code related screaming*

* aaa

funfact: that insistence on modualization broke *EVERYTHING* for the
guns. I doubt I'll fix this.

* Fixes more shit

After I finally worked the salt out from yesterday, I modularized the
code more to the standard required. It seems that the sprites for the
guns/projectiles/vending machines need to be in the titled DMI files, at
least from my observations.

* *internal screaming*

why

* more shit fixed

no impact sounds for the plasmaguns / actual buster. Now there are
sounds.

* (Hopefully) Finaly update with this.

Salty removed, modularized it.

Hope its all good now.

* aaa

Pain.

* final fix

missing sprites fixed
2017-02-28 07:55:22 -06:00
LetterJay
7074b28401 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2017-02-27 16:29:50 -06:00
LetterJay
586021483e no click! 2017-02-27 16:29:28 -06:00
TalkingCactus
2cf17f19df New Icons (#249)
* mech fab

* intercoms

* SMES + APC

* autolathe + pipedisp

* light tubes, light fixtures

* microwave + food processor

* detective revolver

* new laser gun

* R&D machines

* all tcomms machinery

not included: AAS

* new chairs+stools

* cameras + air alarms

* revolver and laser carbine
2017-02-27 15:30:12 -05:00
LetterJay
da5d98f099 Merge pull request #248 from LetterJay/master
Changes discord back to IRC - job tweaks
2017-02-26 15:15:58 -05:00
LetterJay
672bdb5eea Update update_icons.dm 2017-02-26 13:36:43 -06:00
LetterJay
640954498f move everything back to irc 2017-02-26 13:29:18 -06:00
TalkingCactus
be40ffe334 usr << to O.visible_message() (#246) 2017-02-25 12:06:51 -05:00
TalkingCactus
7e75b904ef fixes runtime (#245) 2017-02-25 09:06:45 -05:00
TalkingCactus
36c580c236 The Update (#241)
* auto vote runtime error fix

* part 1

* adds a wolf pai sprite

modified fox sprite that doesn't make your eyes bleed

* missed a painful sprite

* part 2

* ptwhatever

* save

* conflict resolution pt1

* conflict resolution pt2

* almost done with the preferences shit

* fixes missing arousal HUD

* file rename

* even more

* keep the panic commits coming

* forgot one

* wew, gonna go make some small changes

* s o o n

* LOOC admin and player toggles

* fixed backpacks and taurs clipping on the preview

* fixed penis length saving

* typo fix

* arousal fix

* icon tuning

* final
2017-02-24 21:42:15 -05:00
Poojawa
82fe4b01be EMP-proof PA (#239) 2017-02-20 01:06:03 -05:00
TalkingCactus
bd13d677d4 Sweater Weather (#236)
* adds 5 new sweaters

cream blue green purple red

* fuck this didn't go through

* done

* WAIT

* Rename sweaters.dm to cit_uniforms.dm

* .dme fix

* 42
2017-02-20 01:05:49 -05:00
TalkingCactus
2ecae386bb Wolf pAI Chassis (#237)
* wolf pai chassis

* sprite tweak
2017-02-20 01:05:32 -05:00
Roland Forgo
dd916684ad Adds an autoimplanter to research designs, quite high tech and material needs come with it. (#216) 2017-02-18 04:15:39 -05:00
TalkingCactus
0453438a7a Several Balance and Convenience Changes (#235)
* swarmers slowed down

* drones slowed down so they're controllable again

* cake hat force reduced to 6 from 15

* welding tool balance changes
2017-02-18 04:00:27 -05:00
LetterJay
ee42eab64f Merge pull request #234 from LetterJay/master
fix character switching bug
2017-02-17 15:47:53 -05:00
LetterJay
8066422c75 fix character switching bug 2017-02-17 14:43:06 -06:00
LetterJay
8af261f46c Merge pull request #233 from LetterJay/master
fixes jetpack not having a sprite after being upgraded
2017-02-17 09:24:20 -05:00
LetterJay
1ce5fe2bd8 fixes jetpack not having a sprite after being upgraded 2017-02-17 00:07:11 -06:00
TaxMaster
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
LetterJay
51a8dfe5db Merge pull request #232 from LetterJay/master
Splashscreen fix, shuttle tweak, flight suits gone for now
2017-02-16 09:41:38 -05:00
LetterJay
7c7b81e3b8 removes flightsuit from fab 2017-02-16 08:34:24 -06:00
Poojawa
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
LetterJay
fd3923d684 Antag fix (#228)
* shuttle tweak, splashscreen fix

* adds a martyr check for escaping
2017-02-15 01:44:23 -06:00
LetterJay
412701b864 shuttle tweak, splashscreen fix (#227) 2017-02-15 01:44:00 -06:00
TaxMaster
abc3edb45c Add vg clothing to the vending machines (#221)
* Adds in clothing from the /vg/ rip

* adds clothing from the /vg/ rip

* Update machines to add VG clothing

Now with better tabulation and grouping!

* Update vending machines to have VG clothing

"TalkingCactus: it's the fact that it's 100x easier to read when it's vertical"
2017-02-15 01:43:45 -06:00
LetterJay
709490308e adds a martyr check for escaping 2017-02-14 05:31:25 -06:00
LetterJay
06eb1517c3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2017-02-14 04:52:59 -06:00
LetterJay
3f3f5c3242 shuttle tweak, splashscreen fix 2017-02-14 04:49:47 -06:00
Poojawa
84350d3417 fixes travis' shit (#226) 2017-02-14 04:28:51 -06:00
LetterJay
e649b81cc1 adds tongues to alien butcher loot tale 2017-02-13 09:00:43 -06:00