c51b1503ac
clockwork windoors
2016-06-04 10:27:27 -04:00
671521c857
layer
2016-06-04 07:37:34 -04:00
f8bd263eec
Merge branch 'master' of https://github.com/tgstation/tgstation into swordofRATVAR
...
Conflicts:
icons/effects/effects.dmi
2016-06-04 07:34:13 -04:00
65ba2d2800
Makes cloth not have force anymore. ( #18204 )
2016-06-04 01:23:29 -05:00
3793e6187a
Addition Ratvar conversion effects and related changes
2016-06-03 23:19:13 -04:00
6fd1424619
Merge pull request #18085 from Xhuis/earsplitting_string
...
Clockwork Patch III
2016-06-03 19:55:04 -04:00
7c8603a0a8
important features ( #18195 )
2016-06-03 14:48:12 -05:00
4abcc87af4
Minor EfficiencyStation changes ( #18157 )
...
- Adds syringes and beakers to Xenobiology
- Replaces map edited grille-or-trash spawner with coded one
- Adds restroom to virology
2016-06-03 14:47:03 -05:00
a9a97f5a81
Fixes for Merge Tokens ( #18168 )
...
* fixes #15649
fixes #16575
* oops forgot those lines
2016-06-03 14:46:42 -05:00
2b18993b04
Conflicts II
2016-06-03 15:42:19 -04:00
70795389df
More stuff, no conflict fix yet
2016-06-03 15:07:49 -04:00
4c8f8ae53e
Merge pull request #18154 from PKPenguin321/plant-analyzer-repath
...
Repaths plant analyzers
2016-06-03 16:41:02 +10:00
685d938481
Some more work or something, idk
2016-06-02 20:53:51 -04:00
5c3c84dad8
Merge pull request #18137 from ChangelingRain/airblocked
...
False walls now block air
2016-06-03 09:29:08 +12:00
7e93e762f5
Follow-up commit
2016-06-02 14:55:48 -04:00
9fdae2fe4e
Merge pull request #17576 from LatD/Research
...
[Ready for test/merge] R&D level remake
2016-06-02 18:41:43 +03:00
cf71a5833f
repaths plant analyzers
...
so they are no longer children of regular analyzers
2016-06-01 22:44:03 -07:00
5d91f7c0ea
fix!
2016-06-01 20:17:48 -04:00
c27a9a21bb
Merge pull request #18070 from PKPenguin321/clothing-by-nienhaus
...
Adds letterman jackets
2016-06-02 09:01:29 +12:00
3068603350
False walls now block air
2016-06-01 16:29:38 -04:00
9b8c68e704
Merge pull request #18065 from coiax/blood-box
...
Adds "blood freezer" to map; replaces freezer of blood packs
2016-06-01 00:51:52 -05:00
6878e9fddb
Adds luminosity to lasers and sparks. ( #18090 )
2016-05-31 21:18:09 -05:00
7259a6370c
Merge pull request #18086 from KorPhaeron/Igotpaid30dollarstodothis
...
New Chaplain Weapons + Mass Driver buff
2016-05-31 19:54:54 -04:00
fa4ca9877c
New clockwork wall/floor sprites ( #18079 )
...
* New clockwork wall/floor sprites
* 360 conflict dodging
* improved sprites
* new sprites
* smoother despawn
* clang
2016-05-31 18:49:34 -05:00
d5dddf5bae
Kills the sword ghost properly
2016-05-31 17:13:59 -05:00
8d65a58e2c
Fixes sword naming
2016-05-31 16:13:25 -05:00
9042c84087
The sword names itself now
2016-05-31 13:28:36 -05:00
d4240c5378
Merge remote-tracking branch 'refs/remotes/tgstation/master' into Igotpaid30dollarstodothis
...
# Conflicts:
# icons/mob/inhands/items_lefthand.dmi
# icons/mob/inhands/items_righthand.dmi
2016-05-31 12:03:01 -05:00
26cbf2e3bb
You've been down too long in the midnight sea
2016-05-30 23:35:03 -05:00
b654016574
Merge pull request #17936 from MMMiracles/ruin_stuff
...
Adds some spawnable shuttle templates for admin memery
2016-05-31 15:58:12 +12:00
953fe2852b
Merge pull request #18039 from coiax/alt-click-spraycan
...
Adds alt-click to spraycans
2016-05-31 15:55:22 +12:00
aea72a79fd
New Chaplain Weapons
2016-05-30 22:01:51 -05:00
537b8d85dc
adds letterman jackets
2016-05-30 17:13:00 -07:00
37acbe9990
Adds "blood freezer", adds to map
...
No actual changes to the maps themselves, just moving
the bloodpack spawns from map into code.
2016-05-31 00:49:42 +01:00
d89eb178c6
Merge remote-tracking branch 'refs/remotes/tgstation/master' into Research
2016-05-30 18:33:55 +03:00
747977074f
Merge pull request #17994 from coiax/fix-17957
...
Fix: Gang tags can be sprayed over
2016-05-30 11:00:40 +12:00
1ebc858091
Merge pull request #17962 from coiax/admin-logging
...
Adds admin logging to megafauna movement, shuttle loading
2016-05-30 11:00:14 +12:00
444748190a
Merge pull request #17991 from coiax/fix-17990
...
Ghost sword orbits on button click, added URL, POI
2016-05-30 10:55:18 +12:00
0d608250fa
Changed AI core programming so it functions like the AI Upload. ( #18004 )
2016-05-30 10:54:50 +12:00
c88c964f26
Minor Tweaks for PK borgs + recharger ( #17940 )
...
Cyborg rechargers now recharge a minimum of 200/tick, up from a default setting of 20/tick
PK borg cookie dispensers now have a 1 second cooldown
PK borg hug shocks has a 2 second cooldown up from 1
Cyborg hyposprays now log
PK borg harm alarm emagged will no longer stun you if you have bowman headset
PK borgs are the only cyborgs that can hugshock and hugcrush (I added hugs for it, medborgs, and standard borgs
2016-05-30 10:52:52 +12:00
0c95c90286
Adds alt-click to spraycans
...
🆑 coiax
rscadd: Alt-clicking a spraycan toggles the cap.
/🆑
2016-05-29 19:51:38 +01:00
8aa135f470
fixes some of the crap maybe
2016-05-28 11:08:46 -05:00
3910a546e6
Adds admin logging to megafauna movement
...
🆑 coiax
rscadd: Admins are now notified if a megafauna uses a wormhole or a
shuttle.
rscadd: A new Shuttle Manipulator verb has been added for quick access
to probably the best and most bugfree feature on /tg/.
/🆑
Megafauna adminnotifies on portal TP
Standard shuttle names and logging
Also ignore .mdme files
Muh commit
Actually works and stuff
2016-05-28 16:26:28 +01:00
325d8aa807
Merge pull request #17954 from GunHog/Head_Megaphones_100_Percent_Meme_Free
...
Head Megaphones + Megaphone changes
2016-05-28 10:40:31 -04:00
badec181c4
Bring back my APC checks
2016-05-28 13:55:07 +01:00
e81fd145cc
You saw nothing
2016-05-28 13:50:04 +01:00
a729b83265
Fix: Gang tags can be sprayed over
...
Fixes #17957 .
🆑 coiax
fix: Gang tags can again be sprayed over.
/🆑
Also got rid of this APC check which doesn't work anyway because APCs
loc is on the floor and then it's pixel shifted.
2016-05-28 13:40:51 +01:00
a677973a56
Ghost sword orbits on button click, added URL, POI
...
🆑 coiax
rscadd: Spectral sword is now a point of interest for ghosts.
fix: Clicking the spectral sword action now orbits the sword, instead of
just teleporting to its location.
/🆑
Changed the notify_jump alert to notify_action, added three different
notification actions (jump, attack, orbit), modified notify_ghosts and
its callers appropriately.
Spectral sword now just counts the number of orbiting ghosts in the
turf, irregardless of what they're orbiting. Generally this'll be the
summation of orbiters of the mob, and orbiters of the sword.
2016-05-28 12:23:24 +01:00
712c4e81a8
Code review improvements
2016-05-28 13:11:57 +03:00
b6c956e294
Merge pull request #17059 from Shadowlight213/Archangel
...
[Review Ready]Wing mutant body parts and Angel wings
2016-05-28 01:16:16 -05:00
Nerd Lord
TechnoAlchemist
MMMiracles
coiax
Thunder12345
Xhuis
Jordie
oranges
Razharas
PKPenguin321
Cheridan
KorPhaeron
LatD
xxalpha
kevinz000
Lularian