Commit Graph

1064 Commits

Author SHA1 Message Date
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
Jordan Brown
af4d9a85c9 Repaths /obj/item/weapon to /obj/item (#29929) 2017-08-16 10:38:51 -03:00
Jordan Brown
dce49b6caf Adds defines for mouse_opacity 2017-08-14 11:18:22 -04:00
Lzimann
97199dd8b0 Gives an initialize hint to stacks, boxes, closets and bots 2017-08-03 15:30:00 -03:00
Jordan Brown
6806607425 Merge pull request #29369 2017-08-02 09:45:05 -04:00
ShizCalev
d525b18d8d Completes major inhand split project (#29574)
* Completes split project

* More work on it. Should be more or less finished
2017-07-29 16:47:37 -03:00
Qustinnus
7ecbb8a1b2 Merge branch 'master' into disgustport 2017-07-29 03:06:25 +02:00
shizcalev
8ebf6b6a43 cleaned up paper 2017-07-26 05:35:05 -04:00
oranges
ab940008b8 Merge pull request #29454 from ShizCalev/nanotrasen
Standardized the corporate name
2017-07-25 09:34:20 +12:00
oranges
90689ebba1 Merge pull request #29163 from Tacolizard/jim_E_Rustle
Prevents the captain's sabre from rustling jimmies
2017-07-24 11:12:42 +12:00
shizcalev
f31cbb3ac5 Nanotrasen 2017-07-23 04:08:57 -04:00
Xhuis
a3178652d6 Ore satchels no longer have infinite capacity 2017-07-20 12:37:26 -04:00
Ashe Higgs
2438bd2aa8 Small belt overlay rewrite, and tool overlays for toolbelts (#29180)
* Belt overlay tweaks, tool overlays

* Belt overlays now have their own file

* work on porting to the new screwy looks

* Work on screwdrivers

* Fixes screwdrivers

* really SCREWED that one up!
2017-07-19 15:29:35 +01:00
Qustinnus
e39d5d871f me making this port work https://www.oranges.net.nz/~oranges/webm/stuck_pancake.webm 2017-07-19 11:43:55 +02:00
ShizCalev
45d3d52af7 Made some object lists less terrible to read (#29304)
* spaces

* more spaces

* last ones
2017-07-18 10:44:29 -04:00
Joan Lung
ca06bc22e6 Energy swords and other transforming energy weapons are now subtypes of transforming weapons (#29232) 2017-07-17 12:25:01 -03:00
Leo
ca59ca6c23 Changes all access const to be a define (#29260) 2017-07-16 18:44:23 +02:00
ShizCalev
db10f35703 Cleaned up some emag_acts (#29238)
* cleaned up some emag_acts

* Randomized spark sounds

* Made sparky looking things sound sparky too

* early return
2017-07-15 11:27:50 -04:00
ShizCalev
59ef81245b Changes some 1s and 0s to TRUE and FALSE (#29144) 2017-07-10 10:31:34 -04:00
Tacolizard
46620139ac cattle rustler 2017-07-09 15:10:14 -07:00
Joan Lung
1feb0021a1 Removes now-unnecessary obj_integrity definitions 2017-07-08 14:02:50 -04:00
Steelpoint
f8ee37afc0 Ancient Space Station [Space Spawn Ruin] (#28584)
* FirstCommit

* HardsuitAncientSounds

* FurtherWorkSave

* HivebotSpriteMinorMapChange

* FinalFixesPrePR

* MinorFixes

* FixesPart1

* TGMMap

* Wording

* VoidSuitPlusSpelling

* TGMConv

* MoreSpelling

* RadioStorm

* SomehowGotThisToWork
2017-06-25 12:02:31 -04:00
Steelpoint
56a4c179b4 Station Engineers Spawn With Industrial Welder (#28740)
* InitialCommit

* LargeToSmall
2017-06-25 10:17:14 -04:00
nicbn
77a2d3f5cd Replaces "istype"s with is_helpers macros (#28676) 2017-06-22 15:03:19 -03:00
Joan Lung
58c054acb5 Stun is now a status effect (#28654)
* Stun is now a status effect

* I'D RATHER NOT

* smart

* very smart

* pideyview

* small fixes

* slight fix
2017-06-22 10:50:46 +10:00
bgobandit
078a1e45a6 Lavaland mushrooms and plants can now be cultivated. (#28533) 2017-06-20 20:05:31 -03:00
Jordan Brown
6126cbe705 Merge pull request #28612 from Bawhoppen/3branch
Fixes grenade belt and bandolier UI obscuring half the screen
2017-06-20 16:36:23 -04:00
bawhoppen
bcb87d9135 truth 2017-06-20 15:25:51 -05:00
Tacolizard
fded49c639 Adds some custom force strings and fixes a bug (#28597)
* initial

* singuloth

* melee

* fix

* forgot a quote

* cyber1

* cyber2

* capitalization

* cyber3
2017-06-20 15:51:08 -04:00
Lularian
8d12c27499 belts 2017-06-19 15:46:47 -05:00
Joan Lung
2672d88800 Renames stun effects and changes stun input values as preliminary work for changing stuns to status effects (#28524) 2017-06-18 23:03:51 -03:00
bgobandit
5bc348c366 Adds traitor steal objective: the Supermatter Sliver. (Fixed) (#27913)
* Adds a new steal objective, the Supermatter Sliver.

* actually commits theft_tools honke

* i actually dk what this is

* fixes v1

* Supersmatter sliver requested changes

* you know what I fucking hate is unchecking shit

* please does this fix it fucking dme clown shit

* placates the cyberboss and the lziard

* fucking clownery

* I forgot to fucking check it

* Hope this fixes it

* will my children inherit this PR

* reeeeeeeeeeeeeeee

* Let's put this horse to rest now....
2017-06-17 22:32:38 -04:00
Jordan Brown
187ae0bd0e Merge pull request #28419 from Expletive/pocketprotectors
Gives Pocket protectors to various nerdy jobs on the station.
2017-06-17 16:13:09 -04:00
Expletive
fe73e0e920 Gives the captain a somewhat robust golden fountain pen, and some others an average fountain pen. (#28382) 2017-06-16 22:12:10 -03:00
Expletive
7d4b3c38f7 Mutable Appearances 2017-06-13 10:32:35 -07:00
Expletive
f24a84d5a4 Adds pocket protectors and gives them to a bunch of nerds. 2017-06-12 21:39:50 -07:00
Expletive
4aedb9c327 changesrequested 2017-06-12 14:48:37 -07:00
Expletive
1609a4aeb1 Makes medal boxes fancy. 2017-06-12 13:53:50 -07:00
Lzimann
3e34eb9e3f Changes all sounds to be lower case, plus standardizes their references 2017-06-11 00:38:45 -03:00
Mike Long
8e07021c0d Adds F.R.A.M.E. cartridge (#28113)
* Refactors old PDA virus cart code

* Adds F.R.A.M.E. cartridge

* Adds FRAME to uplink

* FRAME can now be used to push telecrystals to the target.

* Makes cartridges more extensible.

* Fixes compilation

* Fixes exploit involving removing target's TC if used multiple times.

* Removes redundant var, in accordance with convention.

* Things actually work now.  Whoops.
2017-06-10 19:17:33 +02:00
Joan Lung
7ec67bc960 Merge pull request #28202 from Tacolizard/medalmemesv2ultra
Gives the RD and HoS medal lockboxes
2017-06-08 21:36:06 -04:00
ShizCalev
f2d829261a [Typo] Duffel Bag (#28200) 2017-06-08 19:16:20 -03:00
Tacolizard
5ea7095875 remake 2017-06-08 12:35:32 -07:00
Expletive
8413960d8e A large and unasked for repath and improvement of accessories (formerly ties, but actually armbands and medals) (#28115) 2017-06-06 22:26:56 -03:00
Joan Lung
5884071627 Renames Clockwork Proselytizers to Replica Fabricators (#28062) 2017-06-05 14:52:31 -03:00
Joan Lung
d5e608807f Only human and silicon servants can help recite multi-invoker scriptures (#28049) 2017-06-04 21:22:55 -03:00
oranges
0979a24e07 Merge pull request #27932 from octareenroon91/patch-48
Attempts to add items to a storage container beyond its slots limit will obtain a failure message again.
2017-06-02 23:41:28 +12:00
octareenroon91
4012ce0aa7 Update storage.dm 2017-06-01 00:24:26 -05:00
QualityVan
aff5e45e55 Makes op belts less brown 2017-05-31 20:40:15 -04:00
Joan Lung
ac4da32733 Splits mining_mobs.dm into separate files (#27773)
* Splits mining_mobs.dm into separate files

* find/replace
2017-05-29 02:16:26 -04:00