Commit Graph

198 Commits

Author SHA1 Message Date
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
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
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
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
Poojawa
e7e9f69ac6 how am formatting?? (#223)
* AAAAAAAAAAAAAAAAAAAAA

* Formatting is dumb

* Update adminhelp.dm

* I'm going to port yog's tickets I think

* wew lads, doubling has been fixed.

* also some quick fixes from TG
2017-02-12 22:40:18 -06:00
Poojawa
1d1b69bd4e AAAAAAAAAAAAAAAAAAAAA (#222) 2017-02-12 21:19:17 -06:00
Poojawa
eee427f4b4 magboot hotfix (#218) 2017-02-12 08:48:24 -06:00
Poojawa
00436e7495 Gibber and fixes (#217)
* citadel memes and cryopod icon fix

* tailwag fix
2017-02-12 07:55:49 -06:00
Poojawa
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
TaxMaster
6a4c8eb493 Port VGs clothing to the server. (#213)
* Add files via upload

* Add files via upload

* Update glasses.dm

* Update miscellaneous.dm

* Update miscellaneous.dm

* Update helmet.dm

* Update misc.dm

* Update magboots.dm

* Update miscellaneous.dm

* Update colour.dm

* Update hardsuit.dm

* Update miscellaneous.dm

* Update armor.dm

* Update miscellaneous.dm

* Update miscellaneous.dm

* Update security.dm
2017-02-12 03:49:26 -06:00
Poojawa
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
LetterJay
b2a4de328b sql_message_system.dm update 2017-02-08 19:24:09 -06:00
Poojawa
dfb3df1583 reverts save file version bullshit 2017-02-08 00:54:48 -06:00
Poojawa
3f8df133d8 other things I missed 2017-02-08 00:49:31 -06:00
Poojawa
d0f50d5488 other things I missed. oops 2017-02-08 00:38:26 -06:00
Poojawa
883ebad540 mob fixes 2017-02-08 00:27:04 -06:00
Poojawa
68bad60a1c admin modules 2017-02-08 00:17:48 -06:00
Poojawa
f49c0c0268 some modules things 2017-02-08 00:06:03 -06:00
LetterJay
463bcc2f31 runtime cleanup!
This reverts commit ceebde6620.
2017-02-07 23:30:59 -06:00
LetterJay
ceebde6620 Revert "sync"
This reverts commit a432886ba3.
2017-02-07 23:21:03 -06:00
LetterJay
84f36e3496 adds missing shark overlay 2017-02-07 18:05:38 -06:00
LetterJay
b24808f39a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2017-02-07 17:50:29 -06:00
Poojawa
356abcd2e5 Species whitelist (#206)
* Body markings

General Species because I give up trying to make each of them
species-specific.

* SAVE FILE UPDATE

* whitelist work

* updated sprites to reflect new species settings

* It's just whitelist stuff broke as shit now

* additional sprite work
2017-02-07 10:36:32 -06:00
LetterJay
a432886ba3 sync 2017-02-07 00:58:30 -06:00