Commit Graph

6462 Commits

Author SHA1 Message Date
Jordan Brown
4f860af265 Merge pull request #31383 from BeeSting12/youlights
Fixes grammar on zippos
2017-10-07 09:37:58 -04:00
Kerbin-Fiber
dc8450a8f9 Fixes Wood Being Invisible. (#31364)
* Fixes Wood

* Makes jackboots store items small and smaller just like in the description.

* Update internal.dm
2017-10-06 22:45:45 -04:00
BeeSting12
4a02903e58 lights to light 2017-10-06 08:34:29 -04:00
Xhuis
c4b3bd8a55 Fixes runed metal and brass sprites 2017-10-06 03:18:19 -05:00
Tad Hardesty
5a0bb2f599 Grammar fixes to atom descriptions (#31293)
* Grammar fixes to atom descriptions

- Capitalization and punctuation on most descriptions
- CentCom instead of centcom where appropriate
- Earth instead of earth where appropriate

* Remove spaces before newlines and oneline some strings
2017-10-05 16:33:35 -04:00
Jordan Brown
dd882ba0c3 Removes old ass belt.dm (#31317) 2017-10-05 16:31:34 -04:00
Jordan Brown
d3dcc118ec Merge pull request #31340 from Firecage/codeshitnotshit
Does some code standardization/consistency.
2017-10-05 15:53:11 -04:00
XDTM
35d8a55926 Adds H.E.C.K. suits, spraycan_paintable component, and reworks item's attackby() (#30525)
* Adds hostile environiment suits

* NOBODY SAW THIS

* the CURSE

* c

* No more stun removal

* fix

* a

* in the chest

* back

* Fixes

* duh

* fucking helmets fucking secbots fucking past coders

* yeah

* REEEEE

* revert to here

* this better work

* cyberboss

* Update effects.dm

* check for charges

* B U L K

* spraycans

* READY

* the if, man

* why the fuck did it convert to spaces

* Fix it
2017-10-05 11:52:47 -04:00
YPOQ
5a616895ed Fixes crafting stacks without breaking crafted machinery (#31298)
* Revert "Fixes stacking when crafting items"

* Fixes crafted stacked items properly

* Update stack.dm
2017-10-05 10:24:34 -04:00
Firecage
ee3e8d2846 merge conflict fix 2017-10-05 11:22:57 +02:00
Firecage
2ae0380fef Does some code standardization/consistency 2017-10-05 11:13:47 +02:00
Supermichael777
f770b69d5b Makes the pda font a prefernce (#31193) 2017-10-04 21:28:44 -03:00
Jordan Brown
fdfc4137ee Merge pull request #31245 from Robustin/swordfix
Fixes Cult 2H Sword Soulshards
2017-10-04 14:02:26 -04:00
bawhoppen
9b7f1ada6b Moves all stack object sprites from items_and_weapons.dmi to their own file (#31273)
* keeko

* forgot the file
2017-10-04 12:59:27 -04:00
ExcessiveUseOfCobblestone
9d3dcfbc55 Fixes Carpsie nullrod from being invisible (#31268) 2017-10-04 11:59:44 -04:00
XDTM
6ed612ce77 Adds the advanced medical scanner, gives one to the CMO (#31179)
* Adds the advanced medical scanner, gives one to the CMO

* MORE SCAN DOC

* dots
2017-10-04 12:15:43 +13:00
oranges
47a74d8cf3 Merge pull request #31135 from KorPhaeron/unconvertable
Adds a var to minds that makes them immune to conversion
2017-10-04 12:14:32 +13:00
Robustin
9772ac1817 Bastard Sword Soul Fix 2017-10-02 14:58:37 -04:00
KorPhaeron
cc309236d9 ismecha define (#31192) 2017-10-02 02:03:40 -04:00
bawhoppen
3e4d747b77 Adds desc to things lacking them. (#31086)
* Desc change

* Update girders.dm

* Update valve.dm

* Update machine_stacking.dm

* Update shuttle_engines.dm

* Update pipe_dispenser.dm

* Update lib_items.dm
2017-10-02 09:07:10 +13:00
Jordan Brown
bdec5d5fc4 Merge pull request #31130 from MrDoomBringer/Doom
Adds the Cargo-Tech-of-the-Shift award
2017-10-01 10:42:31 -04:00
Robustin
ec3f7623df 2H Sword to the Cult Forge - Robustin's Github Adventure (#30887)
* Automatic changelog generation for PR #30056 [ci skip]

* Updated old code

* Slowdown does nothing, removed

* Updated Sprites and Fixes

* Mysterious block issue fixed

* Update cult_items.dm

* Update buffs.dm

* Update book.dm

* Update cult_items.dm

* Delete whirlwind.ogg

* Add files via upload

* Delete items_and_weapons.dmi

* Add files via upload

* Shard list fix

* Final error fix

* Review changes, dash datum

* Why was this a diff

* Uses roundstart time for delay

* Simpler Soul Storage
2017-10-01 01:01:50 -04:00
nicbn
6fb896e4c3 Paper markdown (#30873)
* why it doesn't work

* list thing

* oops

* fixes list. maybe

* Less regex

* wip

* Done I think. I think

* return your functions

* Replace $10 by $a
2017-09-30 09:08:25 -04:00
ShizCalev
51c48409a6 Stops putting RCD, bluespace bags, and staves into ORM (#31093)
* Stops putting RCD, bluespace, and staves into ORM

* CB

* Chat message
2017-09-29 19:33:19 -05:00
ShizCalev
4f4008920f Fixes SM shard extraction (#31111)
* Fixes SM shard extraction

* Space-OSHA called. They want to have a word.
2017-09-29 18:42:40 -05:00
KorPhaeron
5e5ff73046 Adds a var to minds to make them immune to conversion 2017-09-29 16:59:56 -05:00
MrDoomBringer
8343c5c8a3 move around lockbox code hopelessly trying to fix merge conflicts 2017-09-29 17:43:44 -04:00
MrDoomBringer
b3f9669144 Add cargo lockbox 2017-09-29 16:12:50 -04:00
ShizCalev
bc50c77570 Stops revheads from being metagamed with healthscanners & medical HUDs. (#31110)
* Stops revheads metagaming

* Added comment.
2017-09-29 15:59:57 +13:00
kingofkosmos
086d636b17 Alt-clicking descriptions when examining (#30988)
* Adds what alt-clicking does into examine-messages.

* whoops fix

* AI holopad examine remove

* Fixed cigarette pack alt-clicking.

* Spear alt-click-message set to show only if explosive lance.
2017-09-29 15:51:31 +13:00
RandomMarine
2d54930e4d You can now light cigars on burning people (#31081)
* adds lighting cigs on burning mobs

* backslash the

* src
2017-09-28 21:45:17 -05:00
Tungsten
ac8eee7d4d Applying PDA overhaul Upstream (#30613)
* Applying PDA overhaul Upstream

Yeet?

* Used lordpidey's change

Like this?

* The build failed so I'm changing it back

* Update PDA.dm

* Update PDA.dm

* Make the settings visible only on the main screen

mode 0 is the hub, and the hub is the main menu. I think it'd be a lot more convenient for players to always have these options on the main menu if they need them. Makes it really easy to swap colors and fonts at the beginning of the round. I can put it in a settings menu if everyone really thinks it's necessary, but then someone would have to help me actually make the damn icons show up.

* Update PDA.dm

* Update PDA.dm

* Wait, I'm an idiot. I was editing the wrong thing.

* Here's your switch statements boi

* Declare font_index at the "Toggle_Font" code

I declared it exactly where it's relevant, but I think this looks unclean. I also redefined it which I actually needed to do.

* Replaced it where it was

cuz the build broke

* Make the color changer a picker instead of a field

An attempt

* Made these defines

@optimumtact @Cyberboss Like this?
2017-09-29 15:43:22 +13:00
oranges
84e96c53be Merge pull request #30985 from tgstation/Cyberboss-patch-5
Fixes frozen PDAs in the game logs
2017-09-29 15:41:34 +13:00
Robustin
e630e51682 Secure containers give more hints, no RNG, for hacking (#30864)
* Automatic changelog generation for PR #30056 [ci skip]

* Delete AutoChangeLog-pr-30056.yml

* Removes bad RNG

* More instructions

* gud grammer

* Right parenthesis

* Update secure.dm

* Update secure.dm

* Update secure.dm

* less explicit
2017-09-29 15:40:13 +13:00
Jordan Brown
4178c209f1 Configuration datum refactor (#30763)
* Configuration datum refactor

* More WIP

* New easier on the eyes format

* More WIP

* Finished config.txt

* Fucktons more WIP

* The end of conversion draws near...

* Add all this shit

* Done converting entries finally

* Hunting down compile errors

* More WIP

* MORE CONVERSIONS

* More WIP

* More WIP

* Oh shit only 90 errors this time!

* IT COMPILES!!!

* Fixes world start runtimes
2017-09-29 15:36:51 +13:00
Jordan Brown
98e0cd5054 Self replacement fix (#30834) 2017-09-28 13:07:23 -03:00
AutomaticFrenzy
743fa84bd2 Fixed duplicate definition (#31048) 2017-09-28 10:24:12 -05:00
RandomMarine
f2c803965a Back and inhands for air tanks 2017-09-27 17:33:21 -07:00
Jordan Brown
73ea1238dc Merge pull request #31024 2017-09-27 16:38:41 -04:00
Ashe Higgs
b7e7779c19 (Ready) Clockwork Cult Rework: Proof-of-concept (#29741)
* Starting on the rework

* Reworks the Ark

* Work on Reebe

* More Ark stuff

* this too

* Removes ark silliness, remaps Reebe a tad

* Spawning mechanics

* Work on gamemode code

* Finishes up ark stuff

* Removes Judgement, and lots of other changes

* New Ark activation sounds, Ratvar text

* Spawn protection!

* Adds the abscondence bijou

* Bijou stuff

* well, this is it

* somewhat absentminded coder

* Remaps the Reebe z

* replica fabricators now work!

* Guide paper!

* Now they're clockwork floors

* Infirmary, tweaks, numbers

* A new thing!

* this is ok for now

* I was gonna whine but it's actually necessary

* Adds damage scaling to ocular wardens

* I missed a thing

* you can go back too

* New clockwork armor sprites

* Weapons, scripture, oh my!

* no! shoo!

* hey, I forgot about you!

* this looks much better, I'll give you that

* no teleporting into the void!

* we have no need of you anymore

* Conflicteroos

* AUTOMATIC SPINNING CHAIRS

* how many times do we have to teach you this LESSON OLD MAN

* flagged!

* last time, meesa promise

* Conflicts 1

* wood filling

* Kindle is a projectile, and other stuff

* Chameleon jumpsuit, some small changes

* 150 hours of testing

* Curious is the trapmaker's art

* Conflicts 1

* naaah

* Fixes an ark sound

* Removes the prolonging prism

* Adds a delay to warping in

* First steps towards changing the power system

* Removes power from sigils, moves to global

* Conflicts 1

* zoom zoom

* Adds the stargazer, re-adds conversion

* conflicts? more like CLOCK-flicts

* get it? clockflicts?

* Daemon tuning

* Scraps components, 1/?

* A grace period, among other things

* You can't get to reebe from space no stop bad

* Adds some cogscarab shells to Reebe - yes, I get the sounds

* FUCK

* Chairs are very important.

* Clock golems, sound improvement, intercoms

* Sounds, floor fixes, conflicts

* Fixes the conflicts

* Prevents intercom use during non-clock rounds

* Wiki, HUD timer, tweaks, golems

* Components, removes unused structures, rep. fab power

* go-time

* Ending the round is not a good idea

* whoops, forgot about you

* ssh is ok

* this works too
2017-09-27 09:21:26 +13:00
RandomMarine
98ed3d0927 Air tanks get their own sprite + reset fix 2017-09-25 19:25:06 -07:00
Jordan Brown
eb0a747c70 Merge pull request #30863 from pubby/bluepipe
Bluespace pipes
2017-09-25 13:27:29 -04:00
ShizCalev
74f5a8c904 DisplayTimeText mk2 (#30969)
* Adds new helper, DisplayTimeText

* Removed unused define

Thought it would've been nice to have for the future, but I guess it's
fine to go without it.

* CBB

* Revamp

* Early returns

* More cleanup

* Proc cleanup

* Makes fraction only show if seconds is < 1

* Last cleanup

* Revert

* Corrected incorrect round time.

Dunno how nobody ever caught that it was incorrect on live servers, gg.
2017-09-24 19:58:58 -04:00
pubby
18f329a3f1 Datum abductors refactor (#30893)
* Datum abductors

* Update UFO crash ruin
2017-09-25 12:00:08 +13:00
vuonojenmustaturska
f14c7191a5 Tiny batch of Initialize() fixes, mostly stuff that isn't around at roundstart (#30980)
* Small initialize fix batch

/mob/living/simple_animal/parrot/Poly/ghost
/obj/effect/spawner/bundle
/obj/item/device/radio/headset/headset_sec/alt/department
/obj/effect/mob_spawn/human/golem
/obj/item/device/radio/headset/abductor
/obj/item/nullrod/tribal_knife
/obj/effect/spawner/xeno_egg_delivery
/turf/open/chasm/straight_down

* Requested changes
2017-09-25 11:41:48 +13:00
oranges
28d725e8d5 Merge pull request #30975 from ShizCalev/href-tokens
Href tokens
2017-09-25 11:33:49 +13:00
MoreRobustThanYou
1b6f56e8e2 Implant Chairs now also support organs (#30982)
* Implant Chairs now also support organs

* Update implantchair.dm

* Update implantchair.dm
2017-09-24 12:54:22 -04:00
Robustin
0407dcf845 Fixes revolutionary deconversion messages and logging (#30956)
* Update login.dm

* Update login.dm

* Identifies rev deconverter

* Identifies rev deconverter

* Fixed/Updated Rev Deconversion Msg+Logging

* Deconv'd revs now see the damn message

* Improved logging
2017-09-23 12:05:53 -04:00
Jordan Brown
88303aa53d Fixes frozen PDAs in the game logs 2017-09-23 11:31:58 -04:00
Jordie
6cfaf3e61d Merge pull request #30939 from MoreRobustThanYou/patch-8
Using a soulstone on somebody now transfers your languages to the shade
2017-09-23 20:32:15 +10:00