Commit Graph

7677 Commits

Author SHA1 Message Date
ktccd
376dd1f89a Adds custom emotes to slimes (#320)
Does not add the other human emotes, since they seem a bit odd to put
in.
Slimes needs custom emotes for... reasons. You all know why, don't make
me say it in writing! >_<
2017-03-29 22:57:45 -04:00
katnep
31d0f4cb1f Mining Vendor Redo (#298)
* Mining Vendor Redo

basically Re adds all the stuff i added back at the start of 6th port,
also re added stimpacks to the lsit becuase i don't see why they needed
to be removed from it

* whetstone removed

whetstone removed

* price balances

just tweaked the prices of the new bundles to make them actually worth
purchasing following a 5 for the price of 4 standard

* The final change

finishes the requested changes

* removes excessive line spacing

* removes trailing comma
2017-03-29 17:11:00 -04:00
TalkingCactus
0b45e97b3d Automatic MC Re-Starter 9001 (#322)
* 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

* removes depreciated var

* MC rebooter 9001
2017-03-28 07:29:59 -04:00
LetterJay
ef89eba41e Merge pull request #315 from kevinz000/patch-1
Emergency fix for potential server crashing
2017-03-28 00:49:42 -05:00
TalkingCactus
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
kevinz000
c432ec0859 Update chameleon.dm 2017-03-26 13:14:16 -07:00
LetterJay
78616ca6a9 *reverts back to the separated who list
*fixes a lot of mentor related issue (both them not loading and missing verbs)
2017-03-26 10:44:42 -05:00
TalkingCactus
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
kevinz000
5688b6b306 Update chameleon.dm 2017-03-26 03:41:21 -07:00
ktccd
6db6e99830 Ghost-role arousal fix (#283)
* Ghost-role arousal fix

Fixes it so ghost role spawners respect arousal preferences of the
ghost.

* Arousal should respect species traits

This is *currently* having no effect, as no species at the time of
writing uses NOGENITALS species trait. But good for future species I
think.

* Arousal-fix-fixed

Made on_species_gain do the arousal check and apply it properly. Moved
equip to happen AFTER the ckey is assigned, as I couldn't check the
clients prefs before that and it just defaulted to TRUE.
Problem: Human ghost-roles are already human and would not use
on_species_gain. I had 2 fixes for this: Either I made them do so
anyway, doing set_species with human. This is probably redundant and
might break things in some unexpected way....
2nd possible fix is what I am pushing now, just making an else statement
for that situation.
2017-03-26 06:32:51 -04:00
kevinz000
2a8fcb3929 Update chameleon.dm 2017-03-26 01:31:57 -07:00
kevinz000
22cc36345f Update chameleon.dm 2017-03-26 01:30:32 -07:00
Poojawa
a8d181c00c Update admin_verbs.dm (#314)
Enables moderator staff to issue controller restarts
2017-03-25 14:52:44 -05:00
LetterJay
1d518bb4dd updates maploader, fixes a few things 2017-03-24 01:39:11 -05:00
Poojawa
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
TalkingCactus
fcc5e0e2f5 fixes preview icon runtimes+ (#304) 2017-03-21 21:22:47 -05:00
Poojawa
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
TaxMaster
b617e06a30 A small fix (#279)
* Adds In Deep from RA2 into the roundstart music

* Adds In Deep from RA2 into the roundstart music

* A few minor things

Fixes up my plasmagun code so that the projectiles have an
impact_effect, Adds the enclave power armor from Fallout 13 (currently
admin spawn only), and adds a Krotchy doll into the arcade prize list
(Sprites were in Fallout 13's git but I suspect it originated somewhere
else).

* Remove crap

Removing the extra crap so its now just a single-line fix.

* AAAA

ultra-hotfix
2017-03-19 21:03:37 -04: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
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
katnep
4144a627d7 tweaking the file
trying to get it to show up in traitor since it wasn't showing up after
deleting the nuclear tag
2017-03-14 20:11:57 +00:00
katnep
5e9602265b adds CQC to the traitor mode items
Adds the CQC manual from the nuke ops uplink to be included in the
traitor uplink since sleeping carp is on traitor and is significantly
more powerful where as CQC is more intent cycling and reactions so i
think it offers a varied play style oppurtunity for those who don't want
to take sleeping carp but like the martial arts aesthetic
2017-03-14 19:53:44 +00:00
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
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
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
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
2ecae386bb Wolf pAI Chassis (#237)
* wolf pai chassis

* sprite tweak
2017-02-20 01:05:32 -05:00