Commit Graph

4181 Commits

Author SHA1 Message Date
tigercat2000
367f0f1ca2 Merge pull request #8155 from FalseIncarnate/windows
Windows Update
2017-11-10 22:00:19 -08:00
tigercat2000
612d81a906 Merge pull request #8291 from Anasari/AssumingGender
Stop assuming gender.
2017-11-10 10:15:17 -08:00
FalseIncarnate
66f10657bd fix merge conflicts (again) 2017-11-04 17:37:30 -04:00
Ansari
da924006a6 guess i spaced out during this one 2017-11-02 11:20:37 +08:00
Ansari
c22534dd28 \the 2017-10-30 07:51:29 +08:00
tigercat2000
7ca26db3f3 Merge pull request #8285 from Aurorablade/CultPasBalance
Cult Pass split: Balance shit
2017-10-29 11:17:39 -07:00
FalseIncarnate
c1e1dc22d8 merge conflict fix 2017-10-28 18:38:20 -04:00
tigercat2000
a5e4ccdc18 Merge pull request #8103 from FalseIncarnate/reagents
Silver Slime Core and Random Reagent changes
2017-10-27 09:23:50 -07:00
Crazy Lemon
b31110c0e8 Merge pull request #8270 from Kyep/ert_slots
ERT Configuration
2017-10-25 14:55:54 -07:00
Crazy Lemon
217b932606 Merge pull request #8220 from Anasari/BoomChickaWowWoW
Add chem reagent logging for grenade priming.
2017-10-25 14:31:09 -07:00
Crazy Lemon
fcd3ea3194 Merge pull request #8241 from Allfd/fastest-linda
Fastest linda
2017-10-22 10:18:52 -07:00
Ansari
dfd1c17768 Change flash pronoun to theirs 2017-10-22 17:05:59 +08:00
Ansari
a523d44c54 Stop assuming gender. 2017-10-22 15:03:55 +08:00
Aurorablade
f1c60a52ba Balance 2017-10-20 18:44:59 -04:00
Kyep
246e039ae6 Splits janitor/paranormal gear based on ERT level 2017-10-18 17:36:02 -07:00
Kyep
9b7def1f87 Initial version 2017-10-17 23:44:32 -07:00
FalseIncarnate
1a43297db6 merge conflict fix 2017-10-15 21:47:14 -04:00
tigercat2000
b316f484e6 Merge pull request #7609 from Vivalas/splint_nerf
Makes surgery great again (nerfs splints)
2017-10-15 14:00:17 -07:00
tigercat2000
b8d6051c66 Merge pull request #7482 from Aurorablade/DreamFluff
Phantasmic Dream Fluff:Zekes Tendrils
2017-10-15 13:53:02 -07:00
Alffd
7b67eec6f0 Fastest linda 2017-10-14 23:38:39 -04:00
Ansari
fa3f1ba819 actually make it unembeddable 2017-10-14 13:53:57 +08:00
Ansari
00feecc110 Damnit Imsxz 2017-10-14 13:38:41 +08:00
Ansari
7b4ce9922f Add logging for chem reagents when nade are primed 2017-10-10 18:52:56 +08:00
Kyep
65d4719835 stops antagbanned players being mindslaved
squash
2017-10-09 21:46:38 -07:00
Aurorablade
73b0f32927 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DreamFluff 2017-10-07 22:46:57 -04:00
tigercat2000
adbb2a9c06 Merge pull request #8168 from scrubmcnoob/Abductor-Megaphone-FIx
Abductor Megaphone Fix
2017-10-07 11:25:04 -07:00
tigercat2000
8e6240b13b Merge pull request #8190 from Anasari/NerfMiniSquishFlowToday
Nerf yellow slime cell & Buff ion thruster
2017-10-07 10:56:58 -07:00
tigercat2000
988939aa37 Merge pull request #8169 from uraniummeltdown/whetstone
New Cult Whetstone Sprite
2017-10-07 10:31:26 -07:00
Ansari
ed64971e8a Nerf slime cell charge rate to 500, from 1500 2017-10-03 20:42:21 +08:00
uraniummeltdown
5300b90496 change whetstone notice spans to warning 2017-09-30 22:51:19 +04:00
uraniummeltdown
c067dcf385 new cult whetstone sprite 2017-09-30 22:48:18 +04:00
scrubmcnoob
ec6f2f52fc Megaphone FIx
Fixed
2017-09-30 14:43:31 -04:00
uraniummeltdown
6b93bf0d1f adds obj sprite, back sprite and inhands for air tanks 2017-09-30 10:05:56 +04:00
Mars
2fae0f1739 isrobot check 2017-09-28 12:15:52 +02:00
FalseIncarnate
9018195366 Windows Update
Your computer will restart in-

No, not that kind of Windows Update!

Updates windows code (and not delete sys32) to be better in various
regards

Full windows now have double the health of their directional
counterparts. You spend twice the glass, you get twice the integrity!

You can now build one directional OR full windows on grilles, as well as
select the direction of the one directional window you are building on
the grille!
- This is largely quality of life, saves some time on the actual
repairing / building of windows.

🆑
tweak: Full windows are now 100% stronger than before, so you don't have
to pick strength over security.
tweak: Full windows now take longer to deconstruct so they offer
slightly better security against break-ins. Toolspeed does apply.
rscadd: Full and directional windows can be built on grilles now, and
you can even pick the direction! Technically both a tweak and an
addition...
/🆑
2017-09-28 02:31:52 -04:00
FalseIncarnate
693c9fde92 Merge from upstream master
CONFLICTS BEGONE!
2017-09-27 22:02:57 -04:00
tigercat2000
0e44384945 Merge pull request #7465 from Fox-McCloud/peacekeeper-borgs
Adds Peacekeeper borgs; Retains Secborgs
2017-09-27 17:23:16 -07:00
Fox-McCloud
9c3d0a9f8a bleh 2017-09-27 20:06:19 -04:00
Fox-McCloud
e1ce6fac3b oops 2017-09-27 19:21:25 -04:00
Fox-McCloud
70d79e38f1 fixes 2017-09-27 16:01:48 -04:00
uraniummeltdown
fe9fba469b adds the RPD to autolathe and engiborgs, adjusted RPD materials to match the expensive autolathe price 2017-09-25 19:43:54 +04:00
tigercat2000
4f452b2eae Merge pull request #8023 from Birdtalon/defibrilator-shortcut
Control Click shortcut for defibrillator toggle paddles verb
2017-09-24 13:16:50 -07:00
Mars
6f736f4254 Wound, not would 2017-09-24 17:37:15 +02:00
FalseIncarnate
0b2e393507 Arcade Carpetting
Adds arcade carpet to (obviously) the arcade
- Credit to Goonstation for the arcade carpet sprites

Adds arcade carpet as a prize in the prize counter.

Adds a security camera and holopad to Metastation pad

Adds stools to both arcades and rearranges the arcade games in the
Cyberiad arcade
2017-09-19 21:39:24 -04:00
Crazy Lemon
3eaff16f45 Merge pull request #7790 from tigercat2000/vv_improved
VV Refactor & Upgrade
2017-09-17 15:13:04 -07:00
Crazy Lemon
a5e72accde Merge pull request #8052 from Fruerlund/spectrometers
Fixes spectrometers
2017-09-15 10:48:12 -07:00
FalseIncarnate
00583d6f8f Silver Slime Core and Random Reagent changes
Silver Slime Cores now should only spawn drink containers that come
pre-filled with a drink.
- This means no more empty cups/trophies/bottler containers/flasks

Silver Slime Core no longer can summon a random reagent bottle which can
contain ANY reagent
- Adminordrazine was stupidly included in the possibilities
- The core can still summon forth a random drink bottle, which contains
a random drink reagent

Removed a file's worth of relative pathing (random_items.dm)
- Additionally adjusted the code for picking random reagents to use
copied lists or `get_random_reagent_id()` as appropriate to keep things
sanitized and respect blacklisted chems

Also removed nanites, xenomicrobes, and adminordrazine from lists used
to generate random reagent things (like bottles and pills), replaced
with syndicate nanites (which are found in syndicate medical borgs and
much safer to have accessible)

🆑
tweak: Silver Slime Core reactions can only summon forth drinks that
actually contain a drink. Begone thirst!
tweak: Removes some "unsafe" chemicals from lists of potential chemicals
for inclusion in things like random pills or bottles, added one to
replace them.
/🆑
2017-09-14 21:57:48 -04:00
tigercat2000
60e287c019 VV Refactor
Ports /tg/'s VV refactor. Most of this is just cleaning up and making it
easier on the coders, but everyone else benefits too:

 - Mass mod no longer freezes the server (CHECK_TICK <3)
 - Attempting to change any of the step_* values or anything that will
 otherwise disable pixel movement will now prompt you and ask if you are
 sure you want to continue
 - You can actually enter |text| again in a box, rather than being
 forced to always use the multi-line input
 - Cookies! VV saves your search and scroll position for a given UID,
 rather convenient for debugging
 - The refresh button on /clients works finally
 - You can view lists in detail by clicking on them like any other
 reference, and edit them directly that way. This also means there is no
 hard limit on how many variables you can see in a list before it's
 truncated- it will just be hidden until you view the list in VV
 directly.
 - You can shuffle lists and clear duplicate/null entries.
 - Mildly reordered the stuff in the dropdown, inconvenient but
 necessary.
2017-09-14 14:08:38 -07:00
tigercat2000
484af3afc4 Merge pull request #7827 from FalseIncarnate/plumbing
Plumbing Update
2017-09-12 20:20:23 -07:00
tigercat2000
ab4ca3ae38 Merge pull request #8055 from Kyep/wolono
Nerfs missionary/wololo staff
2017-09-12 20:00:21 -07:00