Commit Graph

647 Commits

Author SHA1 Message Date
r4d6
dc2f9f2289 Revert "Merge branch 'master' of https://github.com/r4d6/Citadel-Station-13"
This reverts commit 95c96ed99c, reversing
changes made to a3ee3fe826.
2019-12-31 13:20:41 -05:00
r4d6
12a01d1656 update (#9)
* Minor underwear fixes and tweaks.

* Allows ghost mentors to orbit around the target instead of changing their view to the mob's.

* Ports some hud and update_icon code updates.

* contamination nerf

* Fix

* Stops humanoids whose skin_tone variable is set to "albino" from showing up as pale when examined should their species not use skintones anyway.

* Hello darkness my old friend.

* Ports "Refactors can_see_reagents"

* F

* MKUltra made double opt-in

* ROBUST OPTING MECHANICS

* Adds a hacky framework for digitigrade polyclothes

also adds a digitigrade state for polychromic shorts

* also adds aphrodisiacs, slaps, all hypno as prefs

* errors

* Modernizes Polychromic Uniform Code

No more modular_citadel, but the neck polychrome crap needs more work in another PR

* oh god please don't mess up

* git y u do dis

;-;

* Revert "Makes HE pipes realistically radiate away heat"

* more coat stuff yes yes

* woops

* Wew

* Steos are bad

* new wings and fluff

* Forgot a sprite

* another one

* I swear I had this in here orginally.

* Fixes mistake in less commit.

* reattaches missing antenna

* Effectively removes the long unrequired roboticist encryption key.

* updates ratvar coat

* magazine metal cost tweaks, speedloader in AIB

* the very shitty idea: "muh speedloader"

* Updating dynamic config, some balancing

* Automatic changelog generation for PR #10282 [ci skip]

* unfucks short hair 80s so the left facing sprite doesnt make you look like a crackhead

* Automatic changelog generation for PR #10266 [ci skip]

* ah, the wonders of atomization

* [s] fixes a little door assembly glass dupe exploit

* Update BoxStation.dmm

* Update pai_defense.dm

* fixes bad sprite states

* Automatic changelog generation for PR #10242 [ci skip]

* Automatic changelog generation for PR #10237 [ci skip]

* Added a ghost role with its own spawner for the purposes of chillling in the ninja holding facility.

* holy shit i hope this compiles

* e

* yee

* Automatic changelog generation for PR #10128 [ci skip]

* Nope, it didn't compile, Harold.

* Automatic changelog generation for PR #10283 [ci skip]

* Automatic changelog generation for PR #10281 [ci skip]

* Automatic changelog generation for PR #10250 [ci skip]

* Applied suggestions and minor tweaks.

* f

* yeah fair enough

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

* Update engine_goggles.dm

* changes

* Automatic changelog generation for PR #10264 [ci skip]

* Automatic changelog generation for PR #10298 [ci skip]

* Good idea, tbh.

* Small touch-up.

* Nerfs armor and antistun

* Automatic changelog generation for PR #10296 [ci skip]

* let the adminbus commence

* sprites

* clothing add

* fix

* vending

* loadout

* FIXEdD

* Automatic changelog generation for PR #10265 [ci skip]

* Automatic changelog generation for PR #10289 [ci skip]

* Automatic changelog generation for PR #10268 [ci skip]

* Update CentCom.dmm

* ehh fine but why would you use this proc for that

* Update language_holder.dm

* Automatic changelog generation for PR #10315 [ci skip]

* cocooooonuuuuuuts

* excludes certain ghost roles from being affected by health events

* fixes the thing

* probably fixes pandoras attacking their owners

* Update stamina.dm

* Update sprint.dm

* Update food_reagents.dm

* Automatic changelog generation for PR #10322 [ci skip]

* does the fix?

* What about this?

* Wait no its actually the other way around.

* weh

* Automatic changelog generation for PR #10297 [ci skip]

* Automatic changelog generation for PR #10299 [ci skip]

* more weh.

* even more weh.

* all of the weh.

* ah

* Automatic changelog generation for PR #10217 [ci skip]

* maybe fixes?

* Don't use named arguments on new, please.

* Made a line use the dang macro

* Made sure ghost cafe visitors don't get midround antags

* Automatic changelog generation for PR #10328 [ci skip]

* Physiology so species changes dont fuck it up

* Whoops

* Aarggghh small fucking differences

* Makes ass slap attempts fail more loudly on opted-out mobs

* Automatic changelog generation for PR #10318 [ci skip]

* Automatic changelog generation for PR #10091 [ci skip]

* Update borghydro.dm

* Update grass_carpet.dm

* Ports reflector blobs

Ports reflectors from /TG/

* mouth

* Fixes UI for poly collars

AltClick for collars was seemingly forgotten so I've added it back

* auto ooc

* roundend too

* hnnnnnng code improvements

* marshmallow

* telescopic IVs

* tiny fix

* Automatic changelog generation for PR #10324 [ci skip]

* Automatic changelog generation for PR #10323 [ci skip]

* Update code/modules/hydroponics/grown/grass_carpet.dm

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

* got it

* Update engine_goggles.dm

* [s] Fixes ghost anti-ghostrole timers a little.

* chestbursters deleting brains fix.

* Wait a minute...

* ...which var are you?

* Update belt.dm

* tiny fixes

* makes it a trait

* few fixes

* wow divide by 0 very cool

* Automatic changelog generation for PR #10095 [ci skip]

* Automatic changelog generation for PR #10312 [ci skip]

* Automatic changelog generation for PR #10243 [ci skip]

* Automatic changelog generation for PR #10336 [ci skip]

* Automatic changelog generation for PR #10335 [ci skip]

* Automatic changelog generation for PR #10334 [ci skip]

* Automatic changelog generation for PR #10239 [ci skip]

* Automatic changelog generation for PR #10168 [ci skip]

* Automatic changelog generation for PR #10331 [ci skip]

* Automatic changelog generation for PR #10320 [ci skip]

* Maybe he means this?

* CE Locker Exodus: The Removaling

Removes junk from the CE locker.
Adds empty engineering lockers.
I don't know how to do this as a child and not have populate contents fill the child.

* ok

* Automatic changelog generation for PR #10348 [ci skip]

* Automatic changelog generation for PR #10333 [ci skip]

* changelog.html

* desc

* hnnnng

* weh

* did this actually change anything

* Automatic changelog generation for PR #10337 [ci skip]

* yee.

* yee2.

* Automatic changelog generation for PR #10339 [ci skip]

* Ghommies fixes

* Automatic changelog generation for PR #10306 [ci skip]

* amazing.

* Automatic changelog generation for PR #10357 [ci skip]

* Automatic changelog generation for PR #10301 [ci skip]

* Update chem_master.dm

* Automatic changelog generation for PR #10123 [ci skip]

* Automatic changelog generation for PR #10165 [ci skip]

* Automatic changelog generation for PR #10338 [ci skip]

* Automatic changelog generation for PR #10344 [ci skip]

* Oh god oh fuck

* Update code/modules/hydroponics/seeds.dm

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

* Update code/modules/hydroponics/seeds.dm

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

* Update code/modules/hydroponics/gene_modder.dm

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

* Update telescopic_iv.dm

* Automatic changelog generation for PR #10364 [ci skip]

* afwafwadjiwao

* Automatic changelog generation for PR #10365 [ci skip]

* Automatic changelog generation for PR #10319 [ci skip]

* Automatic changelog generation for PR #10345 [ci skip]

* Automatic changelog generation for PR #10362 [ci skip]

* Automatic changelog generation for PR #10309 [ci skip]

* Makes lockers into subtypes

Adds new lockers cleanly at the bottom instead and as subtypes.

* dab

* dab 2x

* Automatic changelog generation for PR #10349 [ci skip]

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
Co-authored-by: Michiyamenotehifunana <31995558+Michiyamenotehifunana@users.noreply.github.com>
Co-authored-by: Seris02 <49109742+Seris02@users.noreply.github.com>
Co-authored-by: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>
Co-authored-by: shellspeed1 <46614774+shellspeed1@users.noreply.github.com>
Co-authored-by: Hatterhat <31829017+Hatterhat@users.noreply.github.com>
Co-authored-by: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Co-authored-by: CitadelStationBot <citadelstationcommunity@gmail.com>
Co-authored-by: Detective-Google <48196179+Detective-Google@users.noreply.github.com>
Co-authored-by: LetterJay <9606363+LetterJay@users.noreply.github.com>
Co-authored-by: Lin <linzolle@gmail.com>
Co-authored-by: Useroth <37159550+Useroth@users.noreply.github.com>
Co-authored-by: kappa-sama <44128284+kappa-sama@users.noreply.github.com>
Co-authored-by: Arturlang <arturpaavooskari.lang@gmail.com>
Co-authored-by: loginsandylogout <nintendofan356@gmail.com>
Co-authored-by: BlackMajor <henrydyer6@hotmail.com>
Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com>
Co-authored-by: KathrinBailey <53862927+KathrinBailey@users.noreply.github.com>
Co-authored-by: nik707 <38332985+nik707@users.noreply.github.com>
2019-12-31 13:12:23 -05:00
r4d6
7e8581ae88 Merge remote-tracking branch 'upstream/master' 2019-12-23 15:40:02 -05:00
r4d6
e17d32199d update 2019-12-23 13:30:42 -05:00
r4d6
54b3e3603e update (#3)
* testing, further improvements. Tired.

* FLAK

* Automatic changelog generation for PR #9971 [ci skip]

* Update preferences.dm

* Automatic changelog generation for PR #9736 [ci skip]

* this cannot go wrong

* oop

* Changes required to enable for maintenance protocols

All combat mechs that are special get their internals_access increased so the pilots of the deathsquad / nuke team can fix up their mechs without having to steal a robotics ID. Also removes engineering from being able to access mech internals, seems weird to have if only robotics is allowed to handle mechs, probably remnant of engineering robotics?

* Automatic changelog generation for PR #10115 [ci skip]

* Port boops and handshakes

* Update code/modules/mob/living/carbon/carbon_defense.dm

Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>

* Update code/modules/mob/living/carbon/carbon_defense.dm

Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>

* AAAAA

* Add a nose boop sound

* Add a boop sound effect

* Make the boop louder.

* Fixes pubby wall meds being var-edited snowflakes.

* Commit suggestions

Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>

* Commit suggestions

Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>

* Commit suggestions

Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>

* Commit suggestions

Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>

* Commit suggestions

Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>

* Commit suggestions

Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>

* Fixes AI being unable to talk through the holopad.

* Travis had a stroke.

* ports "Standardize obj/updateicon() and update_icons() to update_icon()"

* Update supply.dm

* Update code/modules/vending/cola.dm

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

* Brings carbon action intent hotkeys down to living.

* Update drink_reagents.dm

* Automatic changelog generation for PR #10180 [ci skip]

* Automatic changelog generation for PR #10181 [ci skip]

* Porting a few martial art code updates.

* Adds gas miners to all maps.

* Compress secK9

* whoops

* Hopefully this won't screw up travis.

* Two slimepeople fixes.

* Automatic changelog generation for PR #10072 [ci skip]

* Automatic changelog generation for PR #10225 [ci skip]

* Update drink_reagents.dm

* Automatic changelog generation for PR #10203 [ci skip]

* Automatic changelog generation for PR #10157 [ci skip]

* Automatic changelog generation for PR #10155 [ci skip]

* Automatic changelog generation for PR #10111 [ci skip]

* Automatic changelog generation for PR #10216 [ci skip]

* Automatic changelog generation for PR #10172 [ci skip]

* Automatic changelog generation for PR #10026 [ci skip]

* Automatic changelog generation for PR #10076 [ci skip]

* Update drinks.dm

* Automatic changelog generation for PR #10153 [ci skip]

* ??

* Update snacks.dm

* oops

* probably fixes only neutral traits existing

* Automatic changelog generation for PR #10227 [ci skip]

* argk

* Chef buffs chef buffs tastier food.

"The strong flavor of" was always in game but someone put it behind an else if statement that would never proc.
Now if there's more than 45% (or 30% if you are a lizzard, hissss) of a reagent in a beaker, you will taste a strong flavor! 
Hurrah!

* Automatic changelog generation for PR #10228 [ci skip]

* fixes the sprites

* Actually hold on

So that not everything in the game now tastes like STRONG FLAVOUR. That'd be annoying.

* Magic number man bad, also all heads can spam CC now

* im baby dumb and removed "a hint of" by accident.

Okay whoops haha there we go now both strong and weak should work.

* oh hey macros.

slightly less ugly ™

* modular man bad.

now mörge this so chefs can make delicious dish, hemk.

* Update carbon.dm

* lolman acctually knows how the stuff work

* AAAAAAAAAAAAAAAAAAAA

* Update flashbang.dm

* thank you based ghomtainer (when)

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

* thank you based ghomtainer (when) 2x how did i not notice this

* Automatic changelog generation for PR #10204 [ci skip]

* Converts the main timsorts file from relative pathing to absolute pathing.

* Ports "Added TRAIT_DISK_VERIFIER, refactors how fake disk checks work slightly"

* wew

* Automatic changelog generation for PR #10090 [ci skip]

* Add the sprite for the landmark

* Make it include my files

* Automatic changelog generation for PR #10067 [ci skip]

* Automatic changelog generation for PR #10160 [ci skip]

* drop

* Automatic changelog generation for PR #10079 [ci skip]

* Automatic changelog generation for PR #10207 [ci skip]

* Automatic changelog generation for PR #10214 [ci skip]

* Update mob.dm

* Update mob.dm

* Redo my changes on Box

Hopefully this will fix the conflict with the fire alarms.

* h

* Automatic changelog generation for PR #10193 [ci skip]

* I'm a god. How can you defeat a god? What a grand and intoxicating innocence, how can you be so naive?

* Automatic changelog generation for PR #10054 [ci skip]

* Automatic changelog generation for PR #10126 [ci skip]

* Automatic changelog generation for PR #10142 [ci skip]

* Automatic changelog generation for PR #10051 [ci skip]

* Automatic changelog generation for PR #9925 [ci skip]

* Automatic changelog generation for PR #9563 [ci skip]

* Atomises out the magicnumber change

* Automatic changelog generation for PR #10231 [ci skip]

* Automatic changelog generation for PR #10235 [ci skip]

* Automatic changelog generation for PR #10200 [ci skip]

* Fix the nose boop.

* Remove extra indentations

* Update inhand_holder.dm

* hhh

* ghom help

* ff

* ff

* Automatic changelog generation for PR #10058 [ci skip]

* Automatic changelog generation for PR #10059 [ci skip]

* Automatic changelog generation for PR #9596 [ci skip]

* Automatic changelog generation for PR #9940 [ci skip]

* Automatic changelog generation for PR #10232 [ci skip]

* Automatic changelog generation for PR #10141 [ci skip]

* Begone crap.

* I gotta go fast.

* QoL Update

Move the Engines to a subfolder to be cleaner when there will be 20 submaps on different maps and change the Tesla Submap to incorporate a few changes I did for the Singulo submap.

* Magic number baaad

* Make things even more organized

* Better safe than sorry.

* Automatic changelog generation for PR #10164 [ci skip]

* Automatic changelog generation for PR #10120 [ci skip]

* Automatic changelog generation for PR #10257 [ci skip]

* typo

* Unnecessary OOC note.

* Is merging someone else's PR you personally fixed considerable as self-merging?

* I'm playing dirty because we have too many PRs to merge anyway.

* Automatic changelog generation for PR #10096 [ci skip]

* Automatic changelog generation for PR #9950 [ci skip]

* Automatic changelog generation for PR #10190 [ci skip]

* Automatic changelog generation for PR #9830 [ci skip]

* Suggestions

* Fix indentation

* lowered to 10 after i struggled to open tickets panel

* FUUUUUUUUUUUCK

* Nerfs fun

* FUUUUUUUUUCK v2

* Automatic changelog generation for PR #10263 [ci skip]

* QoL Update

- Rename the cameras and place two more

- Unanchor the shields generators and emitters because they were bugged and will save more time

- Put more rad closets on the Singulo

- Put more insuls on the Tesla since they protect

- Moved the Engineer clothing locker to Boxstation instead of having it in the Engine

- Added a button to the shutters on the north side of PA

- Added a marker to show where to place the console

- Rewire the power wire to be more in a straight line.

* Forgot a "

* Forgot a button on the Tesla

* Update supply.dm

* readds sprites

* Fills white first aid kits to the brim. Ergo how I was fooled into believing it was a tweak and not a nerf.

* Connect the fuel pipe to somewhere

* no more 40% time dilation

* Update __donator.dm

* Update modular_citadel/code/modules/client/loadout/__donator.dm

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

* Update modular_citadel/code/modules/client/loadout/__donator.dm

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

* Update modular_citadel/code/modules/client/loadout/__donator.dm

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

* Update custom_items.dm

* Automatic changelog generation for PR #10254 [ci skip]

* Fix areas and tiles getting ripped off

* Also give Tesla's emitters R-floors

* Automatic changelog generation for PR #10093 [ci skip]

* Automatic changelog generation for PR #10210 [ci skip]

* Automatic changelog generation for PR #10246 [ci skip]

* Update custom_items.dm

* Automatic changelog generation for PR #10218 [ci skip]

* Automatic changelog generation for PR #10274 [ci skip]

* Add the option to restrict the Engine that spawn

* Revert "Add the option to restrict the Engine that spawn"

This reverts commit e3e1f91635.

* Revert "Revert "Add the option to restrict the Engine that spawn""

This reverts commit d851beea16.

* Add config options

* Move the config up to avoid conflict

* Automatic changelog generation for PR #10245 [ci skip]

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
Co-authored-by: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Co-authored-by: CitadelStationBot <citadelstationcommunity@gmail.com>
Co-authored-by: Lin <linzolle@gmail.com>
Co-authored-by: kappa-sama <44128284+kappa-sama@users.noreply.github.com>
Co-authored-by: DeltaFire15 <46569814+DeltaFire15@users.noreply.github.com>
Co-authored-by: Useroth <37159550+Useroth@users.noreply.github.com>
Co-authored-by: BlackMajor <henrydyer6@hotmail.com>
Co-authored-by: deathride58 <deathride58@users.noreply.github.com>
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
Co-authored-by: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>
Co-authored-by: GrayRachnid <Gray_icy@hotmail.com>
Co-authored-by: B1gb3ast <Yeremyrus@live.nl>
Co-authored-by: Seris02 <49109742+Seris02@users.noreply.github.com>
Co-authored-by: lolman360 <22850904+lolman360@users.noreply.github.com>
Co-authored-by: nik707 <38332985+nik707@users.noreply.github.com>
Co-authored-by: LetterJay <9606363+LetterJay@users.noreply.github.com>
2019-12-23 13:29:44 -05:00
Ghom
19fc981cc1 Merge pull request #9596 from Linzolle/abductor-update
Bring abductors up-to-date with /tg/.
2019-12-21 11:15:29 +01:00
Ghom
d33feb6c35 Merge pull request #9888 from Citadel-Station-13/kevinz000-patch-116
The high voltage from tasers can now set people with fire stacks (so things like dousing in fuel) on fire
2019-12-20 14:26:50 +01:00
Linzolle
70e50e57cd Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into abductor-update 2019-12-17 20:21:49 -06:00
BlackMajor
95c0eddc2a Merge pull request #10072 from Useroth/new-tg-plants
Ported bamboo stuff from tg.
2019-12-18 01:02:29 +13:00
BlackMajor
74cc1ec547 Merge pull request #10177 from BlackMajor/FIST
NUCLEAR FIST. A new wizard spell involving punching people so hard they explode.
2019-12-16 14:14:35 +13:00
Putnam3145
c39a5d0462 Merge pull request #10011 from Arturlang/Bloodsuckers
Bloodsuckers, or, yknow, vampires.
2019-12-15 14:41:36 -08:00
BlackMajor
59d0376985 finished 2019-12-14 17:31:26 +13:00
BlackMajor
2bf35ec81c Nuclear fist 2019-12-14 02:15:09 +13:00
Lin
9ec8458803 Merge pull request #9983 from Ghommie/Ghommie-cit408
refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open.
2019-12-10 23:52:31 +00:00
Putnam3145
5522b3d11d Merge pull request #10037 from Ghommie/Ghommie-cit421
Doubles locomotion circuit ext cooldown. Nerfs gun & pneumatic cannons circuits with sanity checks.
2019-12-09 13:34:23 -08:00
Ghommie
414d4b7a90 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit408 2019-12-09 00:04:22 +01:00
Linzolle
1e2a4f606c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into abductor-update 2019-12-08 14:17:00 -06:00
Artur
9773b530f8 More fixes. Urgh 2019-12-08 21:47:25 +02:00
Useroth
c35acf00fe Empty commit to make travis recompile. 2019-12-07 15:18:37 +01:00
Useroth
28ddfd29b6 Merge branch 'master' into new-tg-plants 2019-12-07 14:25:38 +01:00
Ghommie
723690bab0 Demodularize defib disks and projectiles icons. 2019-12-06 23:07:50 +01:00
Useroth
1158c03ed7 Added bamboo. 2019-12-06 19:00:10 +01:00
Ghommie
9ca7bb759c Ports "Slightly improves visible and audible messages." 2019-12-06 02:02:12 +01:00
Ghommie
91ffa11bc9 Nerfs circuit pneumatic cannons and guns with extra sanity checks. 2019-12-04 01:07:36 +01:00
Ghommie
6cc07c5bc3 Ports the energy gun empty state overlay fix. 2019-11-29 02:59:54 +01:00
Ghommie
3b8aebbbc2 refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open. 2019-11-29 00:40:16 +01:00
Linzolle
cc54e5230f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into abductor-update 2019-11-25 21:01:25 -06:00
BlackMajor
c81d1fe7a3 Merge pull request #9867 from Ghommie/Ghommie-cit375
Ports "examine-code refactor"
2019-11-25 11:31:03 +13:00
nik707
6d889e66c4 Merge pull request #9720 from Citadel-Station-13/kevinz000-patch-111
Is it the time of year to buff disablers again?
2019-11-20 22:51:11 -06:00
kevinz000
25efd11d9a Update code/modules/projectiles/projectile/energy/stun.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
2019-11-20 21:44:17 -07:00
kevinz000
ab846bc584 Update stun.dm 2019-11-20 13:54:57 -07:00
Ghommie
21f15e411d Part 3 2019-11-19 19:34:42 +01:00
Ghommie
dd101ef221 Part 2 2019-11-19 18:00:56 +01:00
Lin
6aa6eaafe6 Merge branch 'master' into abductor-update 2019-11-15 23:24:51 +00:00
GrayRachnid
3edaf75722 Ports the Saboteur borg for nukeops and ports new cyborg tool icons and cyborg taser/laser icons. 2019-11-15 16:58:45 -05:00
kevinz000
8f08e1017e Merge pull request #9688 from Ghommie/Ghommie-cit306
Fixing gibspawner runtimes and improving them, how gruesome...
2019-11-14 15:51:20 -07:00
kevinz000
dfa2296758 Merge pull request #9430 from Ghommie/Ghommie-cit220
Ports "Adds three new .38 ammo types", also lazily adding .357 AP
2019-11-14 15:44:59 -07:00
kevinz000
f1612f6619 Merge pull request #9791 from kappa-sama/revolverports
ports TG's nicer revolver sprites for russian revolvers, normal .357 revolvers, and golden .357
2019-11-14 01:39:21 -07:00
kevinz000
3015ec5c04 Merge pull request #9764 from Ghommie/Ghommie-cit335
Dreamchecker compatibility changes, part 1.
2019-11-14 01:37:41 -07:00
kappa-sama
f093024967 better guns 2019-11-12 17:04:36 -05:00
Ghommie
42d9e3cf51 Porting Robustin's Syndicate Infiltrator PR 2019-11-11 18:49:18 +01:00
Lin
df051186eb Merge branch 'master' into abductor-update 2019-11-11 00:08:59 +00:00
Ghommie
1e49ce76d3 Dreamchecker compatibility changes, part 1. 2019-11-10 20:48:30 +01:00
kevinz000
48fb3a0f08 Merge pull request #9694 from kappa-sama/hosnowflake
Buffs security, nerfs antags
2019-11-10 11:40:41 -07:00
kevinz000
d1f6483687 Merge pull request #9704 from Ghommie/Ghommie-cit314
Minor ninja tweaks and stealth nerf.
2019-11-10 11:31:25 -07:00
Ghommie
892b66470b Fixing several minor runtimes. 2019-11-05 23:07:29 +01:00
kevinz000
f4fc3a5a1a Update beams.dm 2019-11-04 21:48:33 -07:00
Ghommie
286b78c84c Minor ninja tweaks and stealth nerf. 2019-11-03 17:14:55 +01:00
kevinz000
c484a209a7 Merge pull request #9669 from Ghommie/Ghommie-cit297
modkit uninstall() calling forceMove() calling loc.Exited() calling modkit uninstall()
2019-11-03 06:17:21 -07:00
kappa-sama
3e95a66513 Update energy_gun.dm 2019-11-02 23:04:06 -04:00