cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-27 01:33:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
35,770 Commits 8 Branches 0 Tags
3b89c5e32043f1c5ca308e70ecc5c19e3eacd5fc
Commit Graph

7630 Commits

Author SHA1 Message Date
Anewbe
393144068e Merge pull request #4427 from MisterLayne/fear_of_needles 
Trypanohpobia
 2017-12-12 19:30:01 -06:00
MisterLayne
ccc88ed9d1 Fear the needle (in that person's hand, too). 2017-12-12 16:18:33 -05:00
Atermonera
24287a1913 Moves Exit VR verb to avatars 2017-12-10 16:31:27 -08:00
Neerti
791754b2de Merge pull request #4382 from Anewbe/parachute 
Adds parachutes
 2017-12-08 20:17:51 -05:00
Belsima
ad0ad62cde The game actually clicks when it claims to. (#4403) 
* Update paiwire.dm

* Update life.dm

* Update traps.dm

* Update safe.dm

* Update alarm.dm

* Update safe.dm

* Update implant.dm

* Update life.dm

* Update traps.dm

* Update life.dm

* Update safe.dm

* Audible message test
 2017-12-07 18:18:01 -06:00
Anewbe
573d3a1bbd Merge branch 'master' of https://github.com/PolarisSS13/Polaris into parachute 
# Conflicts:
#	icons/obj/storage.dmi
 2017-12-07 17:59:13 -06:00
Mechoid
820b41575d Adds Mining Drones and a fabricator for them. Hooray amending commits, also. (#4413) 2017-12-07 17:32:26 -06:00
Belsima
bb6d52d13d Adds blennophobia. (#4397) 
* Adds blennophobia.

* Adds blennophobia to character setup.

* fear updates
 2017-12-05 23:51:36 -06:00
Belsima
c9d53f5aa4 Maint drones may now ventcrawl. (#4394) 
* Maint drones may now ventcrawl.

* Drones can now have any items they want in vents. No stowing needed.
 2017-12-05 23:49:10 -06:00
Mechoid
931056877f Merge pull request #4391 from Anewbe/ghosts 
Ghosts no longer show up over living mobs
 2017-12-05 21:44:23 -08:00
Neerti
fab9a877cc Merge pull request #4390 from Anewbe/species_blood_tweaks 
Makes species bleed out faster or slower
 2017-12-06 00:43:59 -05:00
Anewbe
73991e697e Merge pull request #4395 from PrismaticGynoid/geigerghost 
Ports check_radiation verb for ghosts
 2017-12-05 14:34:05 -06:00
Anewbe
d2a90fcec4 Fixes High Cap water tanks, lets drones move tanks again. 2017-12-04 17:43:57 -06:00
PrismaticGynoid
ba271e168b Ports check_radiation verb for ghosts 
From https://github.com/Baystation12/Baystation12/pull/19390 . Ghosts now have a check radiation verb they can use to see the radiation level of where they're standing, similar to geiger counters. Tested in every scenario involving radiation I could think of, and it works just fine.
 2017-12-03 15:43:01 -08:00
mistyLuminescence
0d458b204e Adds the advanced health analyzer (#4326) 
* WIP - advanced health analyzer

* Adds the advanced health analyzer.

* Updates radiation levels

* Fixes travis and removes snark

* Fixes a bug that wasn't my fault (for real)

* Adds tiers.

* Phasic sounds cooler

* Fixes sprites
 2017-12-03 17:36:51 -06:00
Anewbe
4d938d58bb Ghosts no longer show up over living mobs 2017-12-02 19:43:44 -06:00
Anewbe
c95206c9f3 Makes species bleed out faster or slower 2017-12-02 18:14:35 -06:00
Mechoid
5931a8cf34 Merge pull request #4377 from Anewbe/roller_chairs 
Can no longer run around while in a roller chair
 2017-12-02 16:11:20 -08:00
Anewbe
c2a8afb7c0 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into parachute 
# Conflicts:
#	icons/mob/back.dmi
#	icons/obj/storage.dmi
 2017-12-01 18:47:06 -06:00
Anewbe
085c33e39a Adds parachutes 2017-12-01 18:37:30 -06:00
Anewbe
8ab356a96e Merge pull request #4376 from Neerti/10/28/2017_new_blob 
Adds New Blob
 2017-11-30 22:44:47 -06:00
Neerti
c4e19538b0 Merge pull request #4371 from Anewbe/phoron_contamination 
Contaminated items now respect gloves
 2017-11-30 20:43:27 -05:00
Anewbe
ba7ada513b Can no longer run around while in a roller chair 2017-11-29 23:18:52 -06:00
Neerti
af5c633cdb Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 10/28/2017_new_blob 
# Conflicts:
#	code/game/atoms_movable.dm
 2017-11-29 22:43:05 -05:00
Neerti
acb208dd3f Works on New Blob 2017-11-29 22:35:01 -05:00
Neerti
70d49a1c3a Merge pull request #4181 from Anewbe/radiation_tweaks 
Adjusts how radiation works, especially for FBPs
 2017-11-29 21:17:16 -05:00
Anewbe
21ae066f6c Merge pull request #4367 from Neerti/11/28/2017_variable_click_delay 
Adds Variable Click Delay
 2017-11-29 12:53:15 -06:00
Anewbe
b3eeadfe8c Merge pull request #4366 from Kholdstare34/outbox 
Adds yet another damn hairstyle.
 2017-11-29 12:51:02 -06:00
Anewbe
3633a787e2 Merge pull request #4360 from Cyantime/mousebump 
Mobs can't push objects that they can't pull.
 2017-11-29 12:50:47 -06:00
Anewbe
a8e3dd4d1b Merge pull request #4365 from Neerti/11/27/2017_wild_slimes 
Adds a Wild Slime type for future surface-things.
 2017-11-29 12:50:25 -06:00
Anewbe
37101b9b39 Contaminated items now respect gloves 2017-11-28 23:56:13 -06:00
Neerti
2f7db506eb Adds Variable Click Delay 
Now certain weapons can strike faster or slower than usual. No weapons currently do this as this PR just lays the groundwork for that.
The click delay can also be modified with traits. The slime agility modifier makes attacks happen 25% sooner.
Adds debug test verb to display a weapon's DPS. It's really basic but should be sufficient for future force adjustments I might do in the future.
 2017-11-28 16:11:56 -05:00
Belsima
34f076cbe7 Parrot adjustments. (#4350) 
* Parrot adjustments.

* Adds galactic common to languages.

* Update parrot.dm

* Update parrot.dm

* fixes
 2017-11-28 14:50:55 -06:00
Neerti
a66482de75 Adds a Wild Slime type for future surface-things. 2017-11-28 02:05:37 -05:00
Kholdstare34
411a1b5002 Adds the "Short Hair 3" hairstyle. 2017-11-28 00:55:32 -06:00
Belsima
b44924b156 Boop! (#4348) 
* Cleanbot sounds.

* Floorbot sounds.

* grammer

* Update floorbot.dm
 2017-11-27 15:38:00 -06:00
Cyantime
cdb859ff34 Mobs can't push objects that they can't pull. 2017-11-27 14:44:09 -05:00
Anewbe
1d9af61ff0 Adds a cap to losebreath 2017-11-26 21:55:55 -06:00
Anewbe
1591fdcc81 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into radiation_tweaks 
# Conflicts:
#	code/game/objects/items/devices/defib.dm
 2017-11-26 17:53:00 -06:00
Neerti
7d0b3ffd20 Merge pull request #4332 from Cyantime/shapeshifterhair 
Adds hair color changing ability for prometheans.
 2017-11-26 01:27:12 -05:00
Cyantime
a8eb0b53af Makes Prometheans non-monochrome, allows hair color change 2017-11-24 03:29:10 -05:00
Cyantime
0276f27d2d Fixes a bug in change_hair_color() 2017-11-23 20:15:22 -05:00
Cyantime
d449b8da7f Adds hair changing ability for shapeshifters. 2017-11-23 16:44:07 -05:00
Anewbe
63040bbbc5 Merge pull request #4241 from Belsima/name(name) 
Stops people showing up as (as ID name)
 2017-11-22 14:44:58 -06:00
Anewbe
62d76cba30 Merge pull request #4318 from Mechoid/Mechoid_Has_The_Keys_And_A_Brick_On_The_Pedal 
Adds more Spiders. Touches cuff-code tangentially.
 2017-11-22 01:13:04 -06:00
Mechoid
d5404ae0eb Adds More Spiders. Touches cuff-code tangentially. 2017-11-21 12:59:06 -08:00
Belsima
7317669767 Mice should no longer burst your eardrums. (#4311) 
* No longer bumples.

* what if grammar

* crates can bumble again
 2017-11-21 13:32:21 -06:00
Anewbe
fea8fcc064 Merge pull request #4310 from Neerti/11/19/2017_hunting_rounds 
Adds Hunting Rounds
 2017-11-21 00:29:12 -06:00
Cameron653
ce87bc349c Fixes a bug with allowmodification verb 2017-11-20 20:51:27 -05:00
Cameron653
faf275e202 Fixes pAI access 
fixes https://github.com/VOREStation/VOREStation/issues/2504
 2017-11-20 12:54:10 -05:00