Commit Graph

6822 Commits

Author SHA1 Message Date
LetterJay
64498b8099 oops 2018-08-23 11:58:09 -05:00
LetterJay
1b11773cd9 DB port 2018-08-23 07:20:49 -05:00
deathride58
4978b305e0 Merge pull request #7480 from Citadel-Station-13/kevinz000-patch-2
fixes vending machine remote dispensing
2018-08-23 03:35:44 -04:00
deathride58
e402b4c735 Adds emoji support to deadchat and asay. (#7478)
* Adds emoji support to deadchat and asay

* moves dchat emoji parse to say_dead to make sure sanitization doesnt fuck it
2018-08-23 00:30:59 -07:00
deathride58
695bbef473 makes spears require priming to explode on throw, makes it possible to rip embedded objects out instantly by pressing resist if the item is normal sized or larger (#7450) 2018-08-23 00:30:33 -07:00
Trilbyspaceclone
d871b33ecf Places Large grande into sci prolathen (#7487) 2018-08-23 00:27:48 -07:00
Tupinambis
02a86dd2a0 New Alien Lavaland Ruin (#7455)
* Removes the old "xeno nest" lavaland ruin that currently is blacklisted on the live server, and replaces it with a new "alien nest" ruin.

* Tiny ruin description change.

* Removed all organs scattered around the nest, and replaced them with corpses you must harvest the organs from. Also slightly changes the loot and the locations of said loot.

Drone and Queen corpse spawners have been added.

* Removed xenomorph queen corpse, moved drone corpse into a location that is harder to cheese. Added "Hive's Blessing" (Syringe containing alien microbes.)
2018-08-23 00:26:32 -07:00
deathride58
586b27d489 adds antag ooc (#7477) 2018-08-23 00:25:27 -07:00
kevinz000
3abeb214fd Update _vending.dm 2018-08-20 14:57:31 -07:00
deathride58
5f506bd60a Merge pull request #7470 from Citadel-Station-13/kevinz000-patch-9
alternatively, buffs headrev midround promotion scaling
2018-08-20 04:57:22 -04:00
Cw 3040
0e1c78ca7b Adds temporary replacement for flightsuits (#7421)
* update equipment_designs.dm

-adds Construction Hardsuit and Hardsuit Jetpack Upgrade to designs list

* update all_nodes.dm

-adds construction hardsuit and jetpack upgrade to tech node "EVA
Construction Equipment"
-requires advanced engineering and experimental tools, and 5000 tech
points

* update all_nodes.dm again

-i fucked up somehow
-forgot the display_name
2018-08-17 20:14:18 -07:00
deathride58
4f36f3d263 Merge pull request #6945 from ElPresidentePoole/master
Allows players to commit seppuku with any katana, adds SFX for seppuku
2018-08-17 16:55:28 -04:00
kevinz000
53df5ec85d Update revolution.dm 2018-08-16 17:36:19 -07:00
kevinz000
f43d37acc0 Update camera.dm 2018-08-16 13:06:58 -07:00
deathride58
e902fa8b79 Clarifies the text in the panic bunker bounce message (#7454) 2018-08-16 13:02:48 -07:00
deathride58
f928c44440 Merge pull request #7442 from FlattestGuitar/vending-upgrade
New vending machine UI
2018-08-12 20:40:07 -04:00
deathride58
21c07e6f97 Merge pull request #7441 from FlattestGuitar/blur
Blurry eyes just got blurrier
2018-08-12 20:38:50 -04:00
Unknown
761f2f931b tweaks 2018-08-09 10:16:15 +02:00
Unknown
d6e6d0f70b Ports the lovely vending machine UI by Andrew Montagne from Oracle 2018-08-08 15:23:41 +02:00
Unknown
054be386de readded defines; tweaked size 2018-08-08 12:39:19 +02:00
Unknown
9ca7e38f7a Blurry eyes just got blurrier 2018-08-08 11:42:30 +02:00
kevinz000
0657990182 Update puzzle.dm 2018-08-07 04:46:41 -07:00
kevinz000
4ff02b5a8b Sliding Puzzle 2018-08-07 04:44:12 -07:00
deathride58
26a11df5c5 Merge pull request #7386 from Citadel-Station-13/photography_update
Photography update - Photo persistence, 7x7 photos, adjustable camera photo size, photo logging with full metadata, etc etc
2018-08-04 00:22:07 -04:00
deathride58
d79712cbbf Merge pull request #7404 from Citadel-Station-13/hairstyles
Near full port of all virgo hairstyles and facial hairs (hair_* + facial_* from human_face_m.dmi on virgo codebase)
2018-08-04 00:21:56 -04:00
deathride58
438daa7acf Merge pull request #7411 from Citadel-Station-13/kevinz000-patch-3
Adds admin variable for atmospherics linking on portal guns
2018-08-04 00:21:44 -04:00
deathride58
c4c7e162a1 Merge pull request #7433 from Citadel-Station-13/kevinz000-patch-11
blocks aimbot exploit
2018-08-04 00:08:34 -04:00
Hatterhat
72231976a7 Replaces plasma in execution syringes with amatoxin (#7360)
* Removes plasma from execution syringes

holy shit what a meme

* Replaces initropidril with amatoxin

shit man idk lmao
2018-08-03 19:30:10 -07:00
kevinz000
6353b26822 Update client_procs.dm 2018-08-03 19:26:41 -07:00
deathride58
6b88d1843d Merge pull request #7385 from Citadel-Station-13/kevinz000-patch-1
removes flightsuits until pixel movement is out and i can redesign them
2018-07-28 09:18:06 -04:00
deathride58
f637425108 Merge pull request #7387 from Citadel-Station-13/wormhole_update
wormhole guns now pass through mobs without doing anything but gain hitscan
2018-07-28 09:17:00 -04:00
kevinz000
9325319da1 Update special.dm 2018-07-26 16:44:08 -07:00
kevinz000
5b76760b29 Ports virgo hairstyles 2018-07-26 03:51:09 -07:00
kevinz000
03843f1b20 Update asset_cache.dm 2018-07-26 00:43:52 -07:00
kevinz000
5ccda57266 Update wormhole.dm 2018-07-24 01:06:37 -07:00
kevinz000
22069cd841 Update album.dm 2018-07-21 13:23:02 -07:00
kevinz000
e29016b257 Update wormhole.dm 2018-07-21 02:17:54 -07:00
kevinz000
6e03770b93 Wormhole Update 2018-07-21 01:07:21 -07:00
kevinz000
2a6e4fce59 Photography Update 2018-07-20 15:26:13 -07:00
deathride58
f1739cb482 Upstream fix mirror spree (#7362)
* tgstation/tgstation#39025 - Fixes nukeop eshield not being buyable

* tgstation/tgstation#39011 - [s] Adds missing logging to the staff of storms

* tgstation/tgstation#38980 - Corrects a stat error in the Nuke Ops uplink

* tgstation/tgstation#38988 - Fixes blob victory.

* tgstation/tgstation#38990 - Allow players to un-ignore previously ignored popups for ghostroles, and ignore notifications with no ignore button

needs tgui recompile

* tgstation/tgstation#38994 - Fix timer bug

* TGUI recompile

* tgstation/tgstation#39035 - Fixes navigation computers.

* tgstation/tgstation#39043 - Fixes minor genetics scanner runtime

* tgstation/tgstation#39044 - Fixes burgers icons

* tgstation/tgstation#39055 - Fixes porta_turret and decal shuttle rotations

* tgstation/tgstation#39063 - Stops extinguishers from cooling turfs to absolute zero

* tgstation/tgstation#38967 - Fixes smuggler's satchel init typo

* tgstation/tgstation#38931 - Fixes pulse rifles exploding structures in nullspace and that sort of thing
2018-07-20 03:40:39 -07:00
kevinz000
9547bed028 Update all_nodes.dm 2018-07-20 03:30:38 -07:00
deathride58
f9e7b491ae Merge pull request #7370 from Citadel-Station-13/kevinz000-patch-3
gives AI smartfridge interaction why not we already caved and let them fuck wtih vending machines
2018-07-18 18:07:10 -04:00
deathride58
a18525ad06 Merge pull request #7366 from Citadel-Station-13/mirror-38933
[requires testmerge]upstream mirror - projectile pathing/hitscan lighting refactor
2018-07-17 11:19:07 -04:00
kevinz000
6b1dbf8561 Update flash.dm 2018-07-16 15:33:53 -07:00
deathride58
0fb43d5c4b Merge pull request #7364 from Citadel-Station-13/kevinz000-patch-1
flightsuit speed rebalancing
2018-07-15 17:52:26 -04:00
kevinz000
0e13b3b1c6 Update smartfridge.dm 2018-07-14 23:44:52 -07:00
kevinz000
b33d2b82fb Merge branch 'master' into mirror-38933 2018-07-14 15:26:49 -07:00
kevinz000
bcb1b04c40 Upstream mirror 2018-07-14 15:24:35 -07:00
kevinz000
b8b495ba42 Update species.dm 2018-07-12 09:38:31 -07:00
Bear
88fb190bed display images modularizing 2018-07-10 18:05:16 -04:00