Commit Graph

31601 Commits

Author SHA1 Message Date
Cyberboss
56db0bfbc9 Better safe than sorry 2016-11-27 19:15:07 -05:00
Cyberboss
343027280b 100% less shitty 2016-11-27 19:00:02 -05:00
Cyberboss
0625d2b05d Less hair on fire 2016-11-27 18:58:19 -05:00
Cyberboss
520f31d3fe Squash these please 2016-11-27 18:50:36 -05:00
Cyberboss
aa7d5497c8 Gahh this wasn't well though out 2016-11-27 18:49:55 -05:00
Cyberboss
d025a0335b Moved for master as well 2016-11-27 18:47:41 -05:00
Cyberboss
ac1003c9cd Didn't save everything 2016-11-27 18:46:04 -05:00
Cyberboss
c9dfce29ad At the behest of oranges and MSO 2016-11-27 18:45:29 -05:00
Cyberboss
53fe74fd6f Tgui cleanup 2016-11-27 18:09:45 -05:00
Cyberboss
43d1e77d06 Better checking 2016-11-27 18:06:36 -05:00
Cyberboss
8cf1b974dc You can now expect MC and SS Destroy to be called on round end
Runs the GC queue on SSgarbage Destroy
2016-11-27 18:06:08 -05:00
Jordie
d5bff39b71 Merge pull request #21786 from optimumtact/litanyoffailures
Fixes all remaining addtimers missed
2016-11-27 21:47:44 +11:00
oranges
0b7ceca654 Merge pull request #21769 from erwgd/PmanRandnameFix
Plasmaman random name adjustments
2016-11-27 23:08:49 +13:00
Xhuis
ed11869a79 Gives cyborgs the ability to open morgue trays (#21747)
* Gives cyborgs the ability to open morgue trays

* Small balance changes
2016-11-27 23:07:40 +13:00
oranges
0a52797cb3 Merge pull request #21752 from ChangelingRain/breakthehandsofahulkpunchingthewall
Clockwork walls are now about as hard for hulks to break as rwalls
2016-11-27 23:06:00 +13:00
oranges
1f5889303d Merge pull request #21753 from ChangelingRain/quickbindmore
You can now quickbind up to 5 scriptures
2016-11-27 23:05:50 +13:00
uraniummeltdown
000a5fc502 Balancing Borers (#21726)
* borer reproduce chems 100->200, borer random detatch() removed, borer stun halved, borer infesting someone doesn't auto-unhide, borer event weight 20->15

* stun is 3
2016-11-27 23:03:46 +13:00
oranges
1a7d34c887 Merge pull request #21767 from Shadowlight213/tabletgc
More modular computer gc fixes
2016-11-27 23:01:02 +13:00
Xhuis
118fca35b8 Cleanup on aisle 892 (#21745)
* Plastic explosives now delete upon suicide

* Removes some old code

* Allows resisting out of straight jackets

* Verifies roller bed dock functionality

* Fixes lava's article

* Fixes Syndicate pinpointers being stuck to one mode

* Addresses some of @phil235's concerns

* Removes the Highlander left standing message
2016-11-27 22:59:34 +13:00
Shadowlight213
7a6511ddda Fixes the qdel reference finder (#21763)
* Fixes the qdel reference finder

* Speed improvements.
find_references is now a proc
2016-11-27 22:58:33 +13:00
oranges
af7e6d1323 Fixes all remaining addtimers missed 2016-11-27 08:31:07 +00:00
PKPenguin321
0759c4d83d REMOVES THE FUCKING COMMA (#21768) 2016-11-27 01:22:10 -05:00
Joan Lung
21dfa3af4b Merge pull request #21760 from lzimann/earlyxmasdecorations
Makes x-mas trees automatically spawn
2016-11-26 19:38:37 -05:00
Lzimann
68be7b1b16 Removes code from xmas celebrate() and move to the appropriate holiday datum. 2016-11-26 21:36:55 -02:00
Joan Lung
aa0629df04 Merge pull request #21730 from tgstation/optimumtact-patch-1
Fix runtime with rupees
2016-11-25 21:23:39 -05:00
oranges
54beec00e8 Merge pull request #21694 from KorPhaeron/mining_with_friends
Adds the mining conscription kit, go mining with your metafriends
2016-11-26 15:19:34 +13:00
oranges
2f248b645c Merge pull request #21712 from GunHog/AI_Recovery_Beacon
AI mech pilots are no longer gibbed on mech death + tweaks
2016-11-26 15:07:38 +13:00
oranges
c95df11ed8 Merge pull request #21710 from MMMiracles/remotes/origin/master
Jump Boots Fix + Tweak
2016-11-26 15:07:02 +13:00
oranges
c3106e4574 Merge pull request #21736 from lzimann/grappa
Adds an icon to grappa
2016-11-26 15:06:03 +13:00
oranges
ff5753847c Merge pull request #21737 from ChangelingRain/howhighofachanceisitthatitsjustafakeout
The Ark of the Clockwork Justicar no longer appears above mobs
2016-11-26 15:05:52 +13:00
erwgd
a428559a30 plasmaman/random_name gets gender parameter
Moved Rand Roman from random plasmaman name proc to plasmaman_name proc
2016-11-26 00:41:10 +00:00
Shadowlight213
d0f02a0832 nulls the physical var for the modular computer on destroy 2016-11-25 15:16:50 -08:00
Shadowlight213
e7f5e1b136 Fixes addtimer for doors on shuttles 2016-11-25 14:41:32 -08:00
oranges
98a1f2f006 Fix QDEL_IN macro for new addtimer code 2016-11-26 10:36:46 +13:00
Lzimann
2e8ef6c356 Adds the spawner to the maps 2016-11-25 19:25:48 -02:00
Lzimann
89a03ef577 Adds a new spawn xmas tree landmark and also adds a new holiday, the festive season. 2016-11-25 19:01:53 -02:00
oranges
8d86c23c47 Merge pull request #21722 from kevinz000/soreloser
[I am dead therefore I must go to github and make bugfixes to not die again.]I am a sore loser
2016-11-25 22:07:29 +13:00
oranges
ac9c02ee18 Merge pull request #21704 from KorPhaeron/40minutesofwarningisntenough
You can now see which emergency shuttle is coming in the status panel
2016-11-25 22:06:41 +13:00
oranges
f67cd8e628 Merge pull request #21707 from swindly/wetleather
Makes drying racks dry leather
2016-11-25 22:06:30 +13:00
Cyberboss
e37f807941 Fixes the false armblade removal timer. Refactors addtimer (#21714)
* Clever girl...

* Make the addtimer unique param safe

* Refactor addtimer calls

* Moved the location of the define so the other SSs can use it
2016-11-25 22:05:58 +13:00
oranges
8cf6fe7575 Merge pull request #21718 from Mervill/status_display_click
Change the AI status display by clicking one
2016-11-25 22:05:16 +13:00
Joan Lung
f89932bb38 You can now quickbind up to 5 scriptures 2016-11-24 21:59:36 -05:00
Mervill
787e98cced disposal unit now uses a tgui (#21702)
* disposal unit now uses a tgui

* Woops, still can't do that

* code review

* curse you tgui
2016-11-25 15:54:02 +13:00
Joan Lung
9fc842c927 The Ark of the Clockwork Justicar no longer appears above mobs 2016-11-24 20:29:12 -05:00
Lzimann
324db72e35 Adds grappa icon and a grappa bottle to booze vending machine. 2016-11-24 23:05:23 -02:00
kevinz000
87dbd65811 [READY]] FLIGHTPACKS (AKA cooler, better, and technological wings with a unique gimmick!) (#20860)
* vroom

* wew

* a

* b

* morestuff

* .

* a

* .

* .

* basicsprites+extend/retract

* ...

* .

* thanks travis

* woops

* thankstravisv2

* redundence

* ishouldstopmakingsomanygoddamncommits+empdamage

* stuff

* ..

* ion_trails

* fixes_conflict_1

* fix

* compilesnow

* .

* fuck

* WIP: Multi Step Assembly

* thismightfixitthismightnot

* shoe-attachment

* noselfremoval

* wooops

* tweaksandcrashing

* runtimes

* runtimesfuntimes+crash update 1

* thisprobablywontcompile

* stillwip

* githubPLEASEWORK

* fixes conflicts 3/3

* REFACTORSUNTESTED

* fixingconflicts2

* fixingconflicts3/3

* updates

* stuffs

* ...

* stillWIP

* stufffs

* .

* ..

* runtimesfuntimes2

* stuffs2

* conflictfix

* ...

* fuck

* fix

* bah merge conflicts

* knockback_testing1

* conflictfixing...

* mergeconflicts

* plop

* socloseyetsofar

* tweaksandfixes

* conflicts

* fix

* fixes

* fix

* woops

* woops2

* hotfix

* ...

* flufftextandfixes

* test

* ..

* fix1/2

* stuff

* finallysomeoneteachesmehowtofixthisshit

* FIX

* why

* .

* bitflagsshitflags1

* bitflags-shitflags2

* bitflags-shitflags2

* bitflags_shitflags_4

* autofloating

* minerbuffgetthepun?

* notouchingfloors

* ...

* .

* f l o a t

* kek

* kek

* fixes

* fixes2

* sprites
2016-11-25 13:26:43 +13:00
Joan Lung
22c159ad3e Replaces the 'no cache' alert with an alert showing what you need for the next tier (#21689)
* Replaces the 'no cache' alert with an alert showing what you need for the next tier

* please make a base
please

* this can't be more dynamic, no

* duh, I can do this

* much better

* i'm just kor but with clocks
2016-11-25 13:25:56 +13:00
MrPerson
6dc56abd5e Human nightvision (#21638)
* Human nightvision

Humans can see in the dark a little bit around themselves.
-Add pictures here-

Forces clients onto 510 and suggests clients upgrade to 511 in the default config. The suggestion is still commented out but forcing clients to 510+ is mandatory.

Ghosts and brains now actually render the default HUD instead of skipping the whole process. Dead mobs will show their fullscreens. All of the existing ones will skip rendering to dead mobs to keep the existing behavior of not rendering the brute/blindness screens.
Fixes #17389
Probably fixes #19248 need to test

* Darker human nightvision it is
2016-11-25 13:05:41 +13:00
oranges
f0c636dba3 Fix runtime with rupees
This enforces the item crossing them is actually a mob
2016-11-25 10:21:19 +13:00
oranges
f0806cd368 Merge pull request #21647 from KorPhaeron/buildyourownshuttle
Allows captains to organize a shuttle build event
2016-11-25 10:13:53 +13:00