Commit Graph

474 Commits

Author SHA1 Message Date
Cyberboss
4c4d2c28f9 Fixes 179 (#24807)
* Fixes 169

* What MSO said

* Fix

* Fite me travis
2017-03-08 21:59:59 +01:00
Jordie
edf7b049b1 hi oranges how are you 2017-03-08 22:52:41 +11:00
Cyberboss
e03144dc1d Smoother roundstart take II (#24504)
* Revert "Until I figure out why random keys aren't being transferred"

* Fixes cyborgs not getting their key at roundstart

* Fixes mimes not getting the prefs name

* Fixes clowns not getting prefs names

* Sets the round start timer when it actually starts

* Remove fluff CHECK_TICKs

* Moves siliconization to the jobs module

* Yeah whatever

* Fixes AIization

* HNNNNGHHHH WHY IS THIS UP HERE?

* Fix cyborgs not linking to AI
2017-03-07 21:06:33 +01:00
Jordie
63b3699cdd MySQL Execute error handling (#24738)
* wip commit

* mysql execute proc now handles errors itself

* adds log_sql()

* implements log_sql()
2017-03-07 10:55:42 +01:00
Cyberboss
1bbc640afe Runtime Dynamic Station Loading (#24171)
* Dynamic map loading prototype

* Get the title screen working

* Fixes the random pod bugs

* map configs

* Add back the asteroid

* Ignore the rotate file

* Fix some shit

* More shit fixes

* Babby's first json

* Cyberboss confirmed shitcoder

* Makes map rotation great again

* Moves the map defines

* Delete tgstation2.dm

* Convert runtimestation

* Convert PubbyStation

* Convert OmegaStation

* Convert Metastation

* Convert Delta Station

* Lol file extensions

* Reee line endings

* Take out the trash

* Fix loadallmaps.dm

* Deltaassssssstation?

* Fix travis

* Did I ASK you to change the line endings?

* Remove votable maps

* Cleanup

* Previous config. Load configs in New. Fix splash

* Fix this

* More generic minetype

* STOP TOUCHING THE LINE ENDINGS!!!

* Add some flexibility to /obj/screen/splash

* Fix the shit

* Update gitignore

* Smooth transition from last map

* Better check

* Missed this map rotate check

* Remove these checks too

* Prep for a future request by @kevinz000

* Fix z2 line endings

* Solution for custom .dms

* Rename some things, trim some fat

* Fixes default map_config

* Remove stale comment

* Delete the previous config after loading

* Don't try to open a non-existent file

* Delete the old rotator script

* And references to it

* Line endings

* More line endings

* Del checks from when m-config may have not existed

* LINE ENDINGS

* Update the default map config

* Map load error checking for what it's worth

* Small cleanup

* For case sensitive

* File systems

* Strip maprotate stuff from build script

* Spruce up the _maps tree. Compile some empty space

* Make travis simpler

* LINEARU ENDARU!!!

* tgstation TWO!!!

* Lowercase mine type

* Dummy dm's for testmerging

* Fixes job ordering

* If ghosts wanna watch the map load so be it

* Let them know what's going on

* Fixes z-transitions

* Optimize z expansion further

* Remove this old var

* Fix wiznerd teleportation

* Rmove butt

* Does the thing

* Moved temp configs to the data dir

* Un-touch gitignore

* Forgot templates.dm

* Forgot to include the includer

* Fair enough

* SILENCE IMBECILE!

* @Cyberboss still a fuckboi

* Speed things up a bit

* Fix a potential bug with the error message

* Whatever
2017-03-07 10:45:31 +13:00
Jordie
72a93bae7d Continues to add default sql indexes and table optimisations (#24456)
* adds default sql indexes and table optimisations

* fixes warnings

* edits to text and better update queries

* wrong table

* superior copypaste skills

* who has

* names

* that long

* add inet

* fix for badmins giving 2 billion brainloss

* fixes rank name and adds sanitizing
2017-02-27 22:44:26 +11:00
Cyberboss
16c4656eb3 Revert "Makes game start smoother (#23552)"
This reverts commit 3ab308aa0f.
2017-02-22 20:43:17 -05:00
TalkingCactus
823efdbdcc fixes backpacks being = 1 in character creation (#24314) 2017-02-22 20:32:04 +01:00
Cyberboss
3ab308aa0f Makes game start smoother (#23552)
* Makes game start smoother

* Hide the sausage making

* Fix the shit

* Fixes AI's losing their name prefs
2017-02-22 15:55:50 +01:00
Cyberboss
ccf3e74074 Cleans up new lobby timing (#24250)
* Cleans up new lobby timing

* Changes
2017-02-22 14:41:12 +01:00
oranges
17a7c01e36 Revert "Adds default sql indexes and table optimisations" 2017-02-21 17:53:41 +13:00
Jordie
62da82fcd9 Adds default sql indexes and table optimisations (#24277)
* adds default sql indexes and table optimisations

* fixes warnings
2017-02-21 09:49:48 +13:00
Cyberboss
2d424cf6be Moves some stuff that belongs in dbcore to dbcore (#24145)
* Moves some stuff that belongs in dbcore to dbcore

* Wew garbage

* Ree

* Fixed
2017-02-19 14:21:53 +13:00
Cyberboss
17bc8038f1 Roundstart no longer delayed by initializations 2017-02-14 23:47:01 -05:00
Cyberboss
c32ab0a551 Removes the title music delay 2017-02-12 23:00:04 -05:00
Cyberboss
d260d79fc6 Fixes race condition with unreadying at start 2017-02-05 12:15:01 -05:00
c0
06d8ffb439 Fixes latejoin panel and world topic showing incorrect round duration 2017-01-06 07:15:07 +03:00
bgobandit
e9544b8bec Fixes spelling and misleading messages (#22512)
* Fixes spelling and shit

* satiates the kor, fixes more typos/grammar issues

* spelling madness

* I'm mad with spelling power
2016-12-29 10:14:01 +13:00
Leo
ecca83ff3e Adds the Sidecut hairstyle (#22261)
* Adds the Sidecut hairstyle

* Fixes icon state
2016-12-17 14:20:53 -05:00
Mervill
417c50efa2 These comments where removed by me.exe, just now 2016-12-08 01:48:46 -08:00
Militaires
f2722c995a Adds a new beard style. Broken Man. (#21625)
* -electric guitar-

* i've changed, im sorry

* lisa, baby, im sorry.
2016-11-20 14:55:00 +13:00
Mervill
acfd3004a0 Avoid runtimes in late joining, throw warnings at startup if the emergency shuttle does not exist 2016-10-31 21:26:39 -07:00
Joan Lung
bdcb16113a Adds a few turf istype helpers (#20754)
* a very calming act
when the world is too much, too fast

* i'm tired
but i have to be efficient, infinite

* lick your lips at the sight of me
a fantasy made reality
2016-10-01 19:25:46 +02:00
Incoming
4a14898e22 Merge branch 'master' of https://github.com/tgstation/-tg-station into why_did_this_take_months
# Conflicts:
#	code/modules/client/preferences_savefile.dm
2016-09-22 00:12:55 -04:00
Xhuis
ea21aa4e00 Highlander Patch (#20211)
* Highlander changes

* Prevents losing your claymore F O R E V E R

* Adds partial bloodthirst sating from attacking

* Reworks bloodthirst

* Forgot to push this

* Adds a disk-capture mechanic

* Changes based on feedback

* Bugfixes

* Makes the pinpointer functional
2016-09-20 21:37:08 +12:00
Incoming
b5d92f7a66 New lizard sprites and digitigrade limbs final initial pull 2016-09-19 23:09:50 -04:00
Incoming
5ece015017 If you see this commit it means I've forgotten to amend it 2016-09-01 23:26:00 -04:00
Shadowlight213
01f2343b41 A bunch of tweaks and improvements to silicons 2016-08-25 15:47:42 -07:00
Shadowlight213
5f15792126 Merge branch 'master' of https://github.com/tgstation/tgstation into Fixbundle 2016-08-18 19:47:20 -07:00
Kyle Spier-Swenson
5fcdc063c2 Removes lag from character setup window. (#19498)
ok, this doesn't remove it fully, but it does reduce it decently
2016-07-27 12:39:18 +02:00
Militaires
596b42d5dc Adds a new hairstyle (#19265)
* bitches leave

* cops dont like me so i dont like cops

* alright fun's over
2016-07-13 12:01:22 +12:00
Kyle Spier-Swenson
f8e4304d95 Instant Runoff Voting! (#19153)
* Instant Runoff Voting!

This adds the game code required for voting IRV style

* Fixes votes not working for non-admins

* spans and databases

* this is a silly commit, you should never go here again.

* That explains why some people couldn't drag until they re-opened the page.

* Prevent window focus fuckary with voting.
2016-07-06 16:03:43 +12:00
Remie Richards
fda2c699fc Automatic conversion via Regex 2016-06-11 18:37:48 +01:00
Jack Edge
beeced08be Ghosts are notified when someone joins
🆑 coiax
rscadd: Ghosts are notified when someone arrives on the Arrivals
Shuttle. This is independent of the announcement system, and the (F)
link will follow the arrived person.
/🆑

Also I got rid of a trailing return.
2016-06-10 17:17:26 +01:00
Shadowlight213
ce01058e7c Fixes merge conflicts 2016-05-27 15:36:56 -07:00
Jack Edge
6923c67cf0 Fixes observers being called ghost
Fixes #17925.
2016-05-25 06:15:19 +01:00
Jack Edge
0d6841b1ac Made Restore Ghost Character affect deadchat only
Instead of altering the name of the ghost mob and mind, now it just lets
you babble in deadchat using your regular name with a special var.
2016-05-24 15:04:04 +01:00
Jack Edge
9a15d97046 Ghost name QoL changes
🆑 coiax
rscadd: Ghosts now have the "Restore Character Name" verb, which will set
their ghost appearance and name to their character preferences.
bugfix: Mob spawners now give any generated names to the mind of the
spawned mob, meaning ghosts will have the name they had in life.
the outsiders as they see fit.
/🆑

...

fsdjkafklasdfljk
2016-05-23 23:00:26 +01:00
Shadowlight213
ccb71365c6 Fixes cat ears 2016-05-21 17:20:30 -07:00
Shadowlight213
c793555f89 Fixes appearance bans
Changes check antag (ghost) to (no client)
2016-05-20 19:53:54 -07:00
Shadowlight213
fbeeaeae14 NEW SPRITES!
make flying give immunity to chasms
2016-05-09 23:00:59 -07:00
Shadowlight213
6191cf0add Merge conflict fix 2016-05-08 16:43:51 -07:00
lordpidey
24f47b0223 Devil Antag Round 2. (#15794)
* Re-making the branch and PR of demon.  See #15118 for the old PR

* Adds toy demonologist to arcade machine reward list.

* Implemented two suggestions: Pitchfork now has a demonic subtype, to potentially give botanists a normal pitchfork.

Suiciding with signed contract now uses forcesay instead of say.

* Fixes compile errors.
Re factors contracts to be subtypes rather than datums.  <--- incomplete, still need to summon them appropriately.

* buffed infernal power contract to give passive healing
Nerfed magic power contract to not give robeless MM

* Fixes compile errors

* Corrects orientation of true demon sprite

* Begins work on the sNPC for the true demon/ arch-demon

* Added funeral garment sprites.  These will be used in banishment rituals (hopefully)

* Stashing my work so I can move to another computer.

Re-working the true-demon, it will be a carbon rather than a simple mob.

* Revert "Stashing my work so I can move to another computer."

This reverts commit e8b1e032997b7e17af4ad8630bf21d3620195c4e.

* Git exploded for me, so I have to make a new branch with EVERYTHING.  sorry.

* Fixes compile error

* Ghosts can now click on an arch demon to become a slaughter demon

* Begins to convert demons into a carbon rather than simple mob.

* Demons now resurrect if not banished.

* Beepsky now properly tells security chat about the level 666 threat.

* Contracts now work again.

* old spells now get removed properly.

* adding pitchfork sprites

* Adds hud for the true-demon.  Not functional.

* Fixes another error in the demon hud.  Still broken.

* Demons are no longer immortal, demon huds work properly now.  (it's barebones, but it works.)

* Fixes the "Have mortals sign at least # contracts of TYPE" objective

* Fixed typo in banishlore() and updated wrath/envy sintouch objectives.

* Adds huds for demons/sintouched/soulless, however they are currently unused.

* Updates the demon's hud to work with the recent hud changes.

* Cleaned up infernal jaunt, it works a lot better now and is less buggy.

* Revival contracts now actually take your soul.

* Fixes #16513

* Replaces the infinite slaughter demons with infinite imps.  Sprites for imps are still needed.

* Adds sprite for imps.  It's a redder, smaller slaughter demon.

* Fixes lack of icon for pitchforks

* Gives summon wealth a more appropriate icon.

* Fixes small part I forgot to merge.

* Fixes a few bugs with demonic resurrection.  It's still very buggy.

* Derp, my bad, I didn't mean to admin myself on the main server.

* Fixes edge case of demonic resurrection failing.  Debraining the demon is NOT supposed to be an alternative for the banishment ritual.

* Also did not mean to change this config file.

* Fixes another error in type 1 demonic resurrection.  It works properly now.

* Updates employment contract text.

* Fixes type 2 resurrections.
Demonic contracts are once again permanently on fire.

* Replaces toy demonologist with toy demonomicon.  It still works the same, just different icon/name.

* Adds demonomicon and employment cabinet to box/meta/dream/efficiency.

I could not add it to mini/bird due to conflicts.

* Edits ministation and BirdStation to have demonomicons and employment cabinets.

* Fixes spelling error

* Adds burial garments to maps.

* Update photocopier.dm

Fixes the span when inserting items into photocopier

* Fixes disrupt_spells proc

* Makes a lot of changes as reccomended by Remie.

* Fixes a compile error.

* Updates the lawify/loreify to be lists.  Does not compile.

* Fixes compile errors.

* Arch demons no longer regress upon death.
Speaking a demon's truename gives the demon the opportunity to teleport to you.
Makes demonomicon not care about capitalization.

* Fixes startup error.  Demonic summoning now works.  It's very simple, just say their true name.

* Demons now have a tongue.  True demon bodies are deleted upon regression.

* Demons can now be punched.
Demons can no longer resist a fire out, since it does nothing to them.

* true demons show up in player panel.  Hellfire works again.

* Prepares for commit 16940

* Demons are now known as devils.

Still needs testing.

* Oops, didn't commit everything last commit.

* Finishes converting demons to devils.

* Fixes speech for lizards/flymen when they speak a demon's name.

* Update tips.txt

* Changes variable from static to global as per Remie's suggestion.

I disagree with Remie's assessment, as a list that will never change, even between games, seems like it should be static.

* Removes devil summoning.  Hopefully, I'll be able to eventually find a way to implement it satisfactorily, but for now, I'll leave it out.

* Removes carriage returns

* Combined modified icon files

* Fixes #17184

* Imps no longer show up in the end round report.  This is because there can EASILY be 100+ imps if the crew is well armed.

Non-employment filing cabinets no longer take 30 sec to wrench/unwrench.

* The lawyer can actually buy souls back now.  Oops.

* Fixes true/arch devil spritesheet to have correct sprite names.

* Relocates Box's employment cabinet to Law office.

* De-devil-ing someone now removes the devilinfo.
De-devil-ing now returns an error when used on true and arch devils

* Re-factors whiteness code for jumpsuits.

* Merges icons, reverts failed merge of map

* Merges map with CAS decks

* Fixes copying employment contracts

* Derp, fixes compile error.

* Replaces antaghud with customizable vision range for knowledge boon.

* Prevents a runtime if devil is gibbed while ascending.

* Neatens contract code, and removes excess variable from humans.

* Fixes compile errors

* Organizes weakness code slightly.  Adds ability for a species override on weakness.  (Make flypeople take 2x damage from flyswatters for example)

* Removes sixteen erroneous characters from the codebase.

* Removes trailing return

* Makes typeless for loops, removes a runtime, and removes unhelpful comments.
2016-05-08 18:44:27 +01:00
Shadowlight213
afb7a878d1 Fixes merge conflicts 2016-05-06 16:52:30 -07:00
phil235
750eaa4a57 invisibility = 100 and 101 now use defines. 2016-04-29 01:00:05 +02:00
Shadowlight213
6d6e9818cb More WIP
Initial work on spacemove in atmosphere
Getting stunned now launches you and doubles the stun.
2016-04-24 17:41:10 -07:00
Shadowlight213
303bdec6f5 Angel WIP commit 1
Added basic angel wing Mutant parts
2016-04-22 13:36:43 -07:00
Cheridan
b2fec069f0 Merge pull request #16225 from Ricotez/ghostlooks
Ghosts with hair.
2016-03-26 21:03:44 -05:00
Incoming
1a61c5f4ec Removes the human biases from preferences code. You can now run stations without any humans if you want.
Caveat: All humanized monkeys will still be human, I tried to fix this but thanks to what seems to be a race condition doing so made roughly 50% of all humans drop dead at the first life tick.

Updates the race list in game_options.txt. Our servers don't auto update config files, so this is just for anyone who makes a server going forward.
2016-03-25 00:26:18 -04:00
Ricotez
ae6faabd8a Brighter ghost hair and new preferences.
+Ghost hair is now brighter than before.
+Added a new preference ghost_accs that stores what you want your own ghost to display.
+Added a new preference ghost_others that stores what you want other people's ghosts to display.
2016-03-23 20:41:36 +01:00