shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
33,925 Commits 5 Branches 0 Tags
95249a4d79b028b60b2c2be9ad3bc472d6ce0f39
Commit Graph

14603 Commits

Author SHA1 Message Date
Ghom
95249a4d79 Fixing some issues with floating movetype & co. (#12262) 2020-05-18 04:44:19 -07:00
kevinz000
fd5c635840 adds a snowflakey-ish(??? maybe???) way to modify gun damage so we don't need more shot types for improvised shotguns (#12274) 
* Update gun.dm

* Update _firing.dm

* Update code/modules/projectiles/ammunition/_firing.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-05-18 02:59:50 +02:00
kevinz000
ab93d80289 Reworks cryo knockout times (#12267) 
* Update cryo.dm

* Update cryo.dm

* Update cryo.dm
 2020-05-18 02:43:20 +02:00
lolman360
93b26a787e POCKET SAND (#12263) 
* POCKET

* sAAAAAAAAAAAAAND

* compile

* fix 2

* eeeeeeeeeee
 2020-05-17 17:08:21 -07:00
Ghom
08280a853e Renames 'visible_atoms' and 'get_actual_viewers' procs to 'fov_view' and 'fov_viewers' (#12282) 
* Renames 'visible_atoms' and 'get_actual_viewers' procs to 'fov_view' and 'fov_viewers'

* Ok, signals.
 2020-05-17 17:04:15 -07:00
Ghom
335f5a37b9 Plane adjustments on several low layer objects. (#12286) 2020-05-17 17:02:57 -07:00
Ghom
d8d59e5052 Fixing old and new issues alike. (#12281) 2020-05-17 16:47:53 -07:00
Ghom
12ac08d7c5 Porting tesla/electrocute code updates. (#12280) 
* Porting tesla/electrocute code updates.

* Why is the dominator being insta-deleted by zaps a good idea?

* Yikes.

* ah
 2020-05-17 16:35:17 -07:00
Trilbyspaceclone
fa8351ebd1 Update dinnerware.dm (#12276) 2020-05-18 00:13:26 +02:00
Lin
658fd23feb Merge pull request #12216 from Citadel-Station-13/Ghommie-patch-1 
fixing light tubes / bulb lighting overlays being masked by... lighting.
 2020-05-16 23:45:44 +00:00
Trilbyspaceclone
2e1cc498a3 corrects WT-550 ammo to state 32 rather then 20 (#12275) 2020-05-17 01:05:24 +02:00
Trilbyspaceclone
a71c282dac Makes assistant hivelords less wired (#12256) 
* Update hivelord.dm

* Update hivelord.dm

* Update hivelord.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-05-17 01:04:25 +02:00
MrJWhit
1c7e9b7512 Adds more cogstation paperwork, for future use (#12225) 
* Extra cogstation papers

* Hopefully fixes HTML issues

* Extra quotation mark, maybe that'll get it
 2020-05-16 07:38:42 -07:00
kevinz000
b6a74288b9 [s] cryogenics logging (#12264) 
* Update cryopod.dm

* Update admin_investigate.dm

* Update logging.dm

* Update cryopod.dm

* how asleep was i last night gamers

* Update cryopod.dm
 2020-05-16 05:00:26 +02:00
Ghom
7c7147cb3e Field of Vision component. (#12075) 
* Hopeless WIP for vision cones.

* Core component and hooks done

* Removing clutter.

* linter bashing me for using statements as args.

* Ok.

* continue

* bring back the macro

* Configs and openspace filter.

* Chat plane, reset perspective signal, mechs/vehicles cases, machineries.

* view, viewers and spoopy ghosts.

* Renamed component, admin fun button and snowflakes robots.

* Whoopsie.

* Yikes

* test merge tweak.

* radial yaketi sax.

* Fixed tgui UIs, some messages not displayed to the target.

* Documentation and a little bugfix.

* Pulling QoL, seventh plane made in this PR.

* Fix.

* Tweaks and improvements.

* Update randomverbs.dm
 2020-05-15 15:25:04 -07:00
TheObserver-sys
e4063311fb Finally, peas. (#12211) 
* Establishment of peas, at last. Comes with two mutations! (NO SPRITES YET,SAVING SO I LOSE NO WORK)

* Fixed some shit in my code, like mispellings and an illegal color. God forgive me.

* Eventually, I will find a blue that works.

* It helps when you aren't pants on head, and remember to put the equals sign, my dude.

* Cleaned up some names, added some comments, and trying to make Pax be captialized in the manipulator

* Attempting to fix Pax to be uppercase, also a slight tweak to reagent numbers.

* I honestly don't care enough, and it doesn't like me capitalizing Pax, so fuck it.

* Cleaned some shit up, fixed a problem I noticed where I forgot an entire line of code because I am Big Big Smart Plant.

* Everything should taste now. Thanks to Anne for the advice. (also shifts a few nutriment values about)

* because I am stupid, I forgot a comma.

* Pray for no map by map. 2nd to last commit.

* I really didn't like how the species names looked.

* First set of pea sprites complete, shoutouts to TripleZeta

* Adds Laughin' Peas sprites! Shoutouts to Stewydeadmike!

* fixed a spelling mistake

* Hey look ma, it's not a disorganized mess anymore

* Bugsquashing... maybe?

* Adds World Peas Sprites! Shoutouts to Stewydeadmike!

* It would help if I actually put the harvest product and seed product eh? Try to remember to do that next time.

* Spriter wasn't happy with old laughpeas sprite.

* cleans up taste text, removes empty lines.

* better taste for a terrible wine.

* Travis leave me alone

* Pax reduction

Co-authored-by: The0bserver <Gizmomaster777@gmail.com>
 2020-05-15 07:16:50 -07:00
Ghom
63fb4544b4 Another fix for contraband items costing like premium ones. (#12253) 2020-05-15 07:16:25 -07:00
Ghom
d16c97f06b Taur fixes. (#12248) 2020-05-15 07:16:09 -07:00
Ghom
9d2399ce9f Removing unused files and fixing some stuff. (#12250) 2020-05-15 07:15:15 -07:00
Trilbyspaceclone
c6c4d61ee3 Cargo Rework - MK *why did I ever lison to people that were just powergamers?* (#11975) 
* Baby wheels off

* Oh god factorio is dead!

* Gas-p the nerfs!

* Update gear.dm

* tools

* Update large_objects.dm
 2020-05-15 03:57:28 +02:00
kevinz000
10944d1b52 The bag of holding (and I guess backpack) balancing pass no one asked for (#11864) 
* Ok

* whew

* ok

* fix

* ehh

* fix

* buff disks

* Update _compile_options.dm

* Update tgstation.dme
 2020-05-15 03:44:56 +02:00
Trilbyspaceclone
af0d1da409 Nerfs Drake Armor (#12133) 
* Update cloaks.dm

* Update cloaks.dm

* Update cloaks.dm

* Update cloaks.dm

* Update cloaks.dm

* Update cloaks.dm
 2020-05-15 03:40:13 +02:00
Trilbyspaceclone
f0cf2f8cfa Ports commit "fixes space vines" by AnturK (#12254) 
* Update spacevine.dm

* Update spacevine.dm
 2020-05-14 15:07:32 +02:00
jjpark-kb
99425bbd88 Radial Mining Vendor Voucher (#12246) 2020-05-14 13:59:40 +02:00
kevinz000
f44e9b662b Merge pull request #12238 from Ghommie/Ghommie-cit747 
Some quick economy fixes and improvements.
 2020-05-14 04:48:14 -07:00
kevinz000
616d104c23 Merge pull request #12189 from Ghommie/Ghommie-cit735 
Skill modifier datums.
 2020-05-14 04:46:24 -07:00
Arturlang
ada31990d0 Fixes prosthetic causing bloodsuckers to bug out (#12136) 
* Fixes prosthetic causing bloodsuckers to bug out

* Moved it per ghommies suggestions
 2020-05-14 13:44:48 +02:00
Ghom
fc980b31c2 I did a typo. 2020-05-14 13:44:06 +02:00
Ghom
ce2bb9ff84 Kevinz "the braveless" 000's suggestion. 2020-05-14 13:43:36 +02:00
kappa-sama
fc0ac23eed slight modifications to soda/booze dispenser emag reagents (#12174) 
* these

* coom.

* move

* Update code/modules/reagents/chemistry/machinery/chem_dispenser.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>

* Update code/modules/reagents/chemistry/machinery/chem_dispenser.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-05-14 04:27:19 +02:00
Lin
0d92783a91 oops. (#12242) 2020-05-14 00:22:57 +02:00
Trilbyspaceclone
899c5a4575 Corrects evey storge with storage (#12220) 
* Update medical.dm

* Update autobottler.dm

* Update autobotter_designs.dm

* Update medical_designs.dm

* Update hardsuit.dm

* Update code/modules/cargo/bounties/medical.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-05-13 21:21:11 +02:00
Lin
2dedf0d6b6 Merge pull request #12015 from kevinz000/typing_indicators 
Typing Indicators (v2)
 2020-05-13 18:19:26 +00:00
Trilbyspaceclone
871361936c Replaces mosins in russian crates with 10mm surplus rifles (#12176) 
* Update security.dm

* Update armory.dm

* desc

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-05-13 05:35:01 +02:00
kevinz000
4aca1e8f62 Update medicine_reagents.dm (#12233) 2020-05-13 04:20:05 +02:00
Ghommie
88e499a39a Some quick economy fixes and improvements. 2020-05-13 03:31:16 +02:00
Lin
fd30edca9c infinixeno (#12234) 2020-05-13 03:18:25 +02:00
kevinz000
81424914e6 Merge pull request #12215 from Trilbyspaceclone/patch-377 
Adds more ballmer lines
 2020-05-12 12:35:05 -07:00
kevinz000
ff2158b20b Merge pull request #12206 from Ghommie/Ghommie-cit742 
Porting tg's icon for that plant-speak language.
 2020-05-12 12:28:08 -07:00
kevinz000
395d434e6e Merge pull request #12200 from Ghommie/Ghommie-cit738 
nutrition adjustment wrapper procs from tg.
 2020-05-12 12:28:02 -07:00
kevinz000
40d2d35ffa Merge pull request #12205 from Ghommie/Ghommie-cit741 
A few runtimes, fixed.
 2020-05-12 12:27:45 -07:00
kevinz000
afbbde610a Merge pull request #12201 from Ghommie/Ghommie-cit740 
Purging unused dogborg items.
 2020-05-12 12:27:26 -07:00
Ghommie
757706653d Map paths. 2020-05-12 21:01:34 +02:00
Ghommie
7fb96ab0cf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685 2020-05-12 20:06:59 +02:00
kevinz000
90d4f213bf Update preferences.dm (#12230) 2020-05-12 17:39:37 +02:00
Ghom
bd19763236 Update lighting.dm 2020-05-12 00:18:27 +02:00
Trilbyspaceclone
95330e4baf Update life.dm 2020-05-11 17:17:04 -04:00
Trilbyspaceclone
c14197bd1b Update life.dm 2020-05-11 17:16:10 -04:00
Trilbyspaceclone
0df3483d6f Update life.dm 2020-05-11 17:15:29 -04:00
Trilbyspaceclone
8fa1a0ba58 Update life.dm 2020-05-11 15:48:01 -04:00