Commit Graph

4125 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
Leo 5fafb4befe Merge pull request #29889 from Cyberboss/MouseOpacityDefines
Adds defines for mouse_opacity
2017-08-15 13:01:28 -03:00
Jordan Brown f0f456e8c3 Merge pull request #29854 2017-08-14 17:00:16 -04:00
Jordan Brown 87ea31f5b5 Merge pull request #29871 2017-08-14 17:00:10 -04:00
shizcalev 2a5df54e7c moved can_trigger_gun to weapon parent 2017-08-14 13:30:20 -04:00
Jordan Brown dce49b6caf Adds defines for mouse_opacity 2017-08-14 11:18:22 -04:00
Kyle Spier-Swenson f2cf4c2f5c [ready]Makes bIcon better (#29690)
Goonchat will use the asset cache, you now have to specify who to send the icons too.

Goonchat will now load icons in the background, displaying them once they load. this prevents the message from being delayed while the icons are sent.

Icons that aren't preloaded using the asset cache system will not render on ie8 clients. This is because of a ie8 bug that prevents changes on runtime created images from rendering.
2017-08-14 10:40:50 +12:00
Cyberboss 80bd5e3a7f Merge pull request #29840 2017-08-13 02:16:27 -04:00
Xhuis 210f03723e Fixes Syndicate cyborg esword icons 2017-08-13 00:48:33 -04:00
MoreRobustThanYou 1ee360f228 His Grace now shows up on the orbit list (#29819)
* His Grace now shows up on the orbit list

* .

* Update his_grace.dm
2017-08-11 17:08:38 -03:00
ShizCalev 2d133d3668 Fixed inhand for cable cuffs (#29811) 2017-08-11 09:51:46 +02:00
FrozenGuy5 026d4ed8da initialize() (#29807) 2017-08-11 09:50:00 +02:00
Jordan Brown e71ae59245 Ports weaponry to Initialize (#29804) 2017-08-11 09:49:30 +02:00
kingofkosmos 10c5366f4a Compacted the used-check. Corrected whetstone-warning-spans. 2017-08-10 23:03:12 +03:00
kingofkosmos ac218908cd Adds icon_states to the unused and used Eldritch whetstones. 2017-08-10 22:48:40 +03:00
FrozenGuy5 4b4cd5e416 decapitalizes flyswatter in weaponry.dm (#29805)
* spelling

* initalize supermatter sword

* is this how you revert a commit hurrdurr
2017-08-10 08:08:56 -05:00
Jordan Brown df94d4b189 Merge pull request #29747 from lzimann/machinerycopypasta
Removes a great amount of machinery copypasta with circuitboards.
2017-08-09 15:14:16 -04:00
Lzimann b967520144 Fixes dme issues. Also renamed _circuitboard.dm to circuitboard.dm 2017-08-09 13:44:23 -03:00
Lzimann 58d0f12c5c Removes a great amount of machinery copypasta with circuitboards.
Also changes New -> Initialize in most of them.
renamed: `code/game/machinery/computer/computer.dm` -> `code/game/machinery/computer/_computer.dm`
renamed: `code/game/machinery/machinery.dm` -> `code/game/machinery/_machinery.dm`
Moved all circuitboards to a new folder at `code/game/objects/items/weapons/circuitboards`
2017-08-09 11:10:48 -03:00
Jordan Brown 3c56d0f4f3 Ports duplicated slipping code to a component (#29628)
* Ports duplicated slipping code to a component

* Makes metal not slippery

* asdf

* Instead of cherry picking like an idiot I could just copy paster

* OOP

* And blood, don't forget Fry's blood!

* Further fixes

* A more generic fashion

* Use the new system

* Fixes

* Fix cartridge type

* Remove inertia
2017-08-09 16:06:15 +02:00
octareenroon91 a926a43767 Fix RCL loading (#29773) 2017-08-08 16:58:13 -03:00
shizcalev 22764665c9 CentCom Standardization 2017-08-07 19:04:27 -04:00
Firecage f65786a8cf The inhands of the Dark Blessing chaplain weapon is now visible. (#29727) 2017-08-05 11:02:21 -03: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
Jordan Brown d3a4468ede Fixes devil pitchforks being uninitialized (#29610) 2017-08-01 17:57:15 -05:00
Jordan Brown 6df66f730f Merge pull request #29617 2017-08-01 09:40:33 -04:00
shizcalev 99624b8e74 further spellchecking 2017-07-31 23:09:08 -04:00
MoreRobustThanYou d4966faf23 removes ERP material 2017-07-31 21:48:50 -04:00
Cyberboss 8032eeab74 Merge pull request #29558 2017-07-29 20:41:00 -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
Unknown 2efdc78681 this fixes the PR 2017-07-29 03:52:55 +02:00
Qustinnus 7ecbb8a1b2 Merge branch 'master' into disgustport 2017-07-29 03:06:25 +02:00
octareenroon91 fb314c525b Give c4 correct plastic_overlay
Fixes #19270
2017-07-28 15:46:49 -05:00
MoreRobustThanYou 899bb2a305 Ports Rapid Cable Layers from /vg/ and paradise (#29119)
Add's a tool that lays cable as you walk , speeding up cable construction

add: Nanotrasen has begun production of the Rapid Cable Layer, a tool that helps you lay down cables faster
add: You can now craft ghetto RCLs with metal, a screwdriver, welder, and wrench. They hold less cable, and may fall apart or jam!
2017-07-28 09:58:40 +12: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
Qustinnus fedf7ba7fd pleases the gods 2017-07-20 17:10:16 +02:00
kevinz000 c48bd7ca08 Adds investigate logs to portals (#29334)
* Update teleportation.dm

* Update admin_investigate.dm

* Update logging.dm

* Update teleportation.dm

* Update teleportation.dm

* Update teleportation.dm

* Update teleportation.dm

* Update teleportation.dm

* Update teleportation.dm
2017-07-20 08:57:46 -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
Qustinnus 2312ff09be Fixing conflicts 2017-07-19 11:19:52 +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
Leo fea979b46a Merge pull request #29303 from kevinz000/patch-255
Fixes flashbang stun times
2017-07-17 22:13:46 -03: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
Jordan Brown de3f268385 Merge pull request #29262 from ChangelingRain/rpdtweak
RPDs can now place disposals pipes on dense non-wall turfs
2017-07-16 12:50:05 -04:00