Commit Graph

3847 Commits

Author SHA1 Message Date
duncathan salt
b6f4f78de9 Merge pull request #25753 from kevinz000/patch-109
Fixes ERT IDs
2017-04-02 02:15:06 -06:00
duncathan salt
e3cfa075bf Merge pull request #25747 from kevinz000/patch-107
I ded pls fix: Stunbatons are the best counter against syndicate cyborgs
2017-04-02 02:12:50 -06:00
kevinz000
c7adb60959 Update cards_ids.dm 2017-04-01 17:40:48 -07:00
AnturK
8cbbd9ea0f Fixes chem implants (#25729) 2017-04-01 21:35:52 -03:00
kevinz000
abb60db779 Update cards_ids.dm 2017-04-01 00:50:46 -07:00
kevinz000
ad4251b0d6 Update stunbaton.dm 2017-03-31 18:53:01 -07:00
bgobandit
0f1c4cb4a2 Fixes the energy cutlass. (#25636) 2017-03-31 09:37:15 -03:00
kevinz000
1e482f3907 Flashbangs no longer work on the dead (#25442) 2017-03-25 10:05:19 -03:00
coiax
a31ad34b81 Explosive implant action button can always be activated (#25389) 2017-03-23 20:41:11 -03:00
octareenroon91
67be18012b Fix synthetic arm blade origin_tech 2017-03-18 21:38:53 -05:00
octareenroon91
6384b1a240 Update cigs_lighters.dm
Cause cigs/ecigs to consume chemicals whether or not the owner can absorb them.
2017-03-17 12:08:48 -05:00
Iamgoofball
099c822b7c RCD refactor (#25154)
* Refactors RCD code
2017-03-17 00:22:22 -03:00
Joan Lung
0cf2e02bb6 Red and green energy swords have much less saturated light colors (#25118) 2017-03-16 20:25:51 +13:00
Cheridan
856583d6c5 Merge pull request #24989 from jughu/honeybum<3
Lets you carry honey in plant bags
2017-03-13 14:33:29 -05:00
Cyberboss
012eaec1b9 Mob Initialization (#24840)
* Mob Initialization

* new_player Repath

* Fix the dme

* Fix the shit

* Fix a loc

* Fix another loc

* But, in my haste, I forgot the cola!

* Another loc

* ANOTHER LOC

* Further docs

* Where'd that s come from

* Fix shit

* Better
2017-03-13 20:21:12 +01:00
coiax
f1d1e6f5e9 Demotes HANDSLOW to secondary flag (#24878)
It's used in literally four places, it doesn't need a high speed
bitflag slot.
2017-03-13 21:59:48 +13:00
Mike Long
f36feb87b5 Lordpidey devil fixes (#24693)
* Devils made via event can no longer ascend.

Admins can control whether or not a devil may ascend via traitor panel.

* Adds logging

* Fixes #21326,     Fixes #21321

* Fixes compile error, removes dead code.

* Moves logging to where it's supposed to be.

* Arch devils can now destroy walls with pitchfork.

* Fixes compile error.

* Summon dancefloor can't be used to break down walls.

* Improves disco floor wall check

* Fixes traitor panel for devils.

* refactors human attack_hand

* Fixes compile error

* Devils now respawn with clothes.
2017-03-12 20:55:36 +01:00
jughu
03886f7d43 Update bags.dm 2017-03-11 18:00:04 +01:00
Lexorion
e5e4101f45 gives the bag of holding unique inhands (#24985)
* gives the bag of holding unique inhands

* improves south sprite
2017-03-11 11:17:57 -05:00
Cheridan
4418958f94 Merge pull request #24911 from Supermichael777/Box-meme
Removes the singularity beacon kit from the traitor bundle list.
2017-03-11 02:51:12 -06:00
Joan Lung
7041654243 Removes His Grace ascension (#24909) 2017-03-10 22:36:02 -05:00
XDTM
2f194043e5 Fixes recycled explosive spears (#24857)
* tentadel

* back to normal

* Fixes recycled explosive spears
2017-03-10 23:01:18 +01:00
Lzimann
5a618297ce Replaces the default output with the to_chat wrapper. 2017-03-10 01:32:05 -03:00
Supermichael777
c8c6985398 okay 2017-03-09 19:58:35 -05:00
Supermichael777
ff8d971348 Removes the lord singulo box from the memeboxes list 2017-03-09 18:53:33 -05:00
Mike Long
e9fe283494 Adds glitter bombs (#24700)
* Adds glitter bombs

* Fixes blue glitter description
2017-03-10 11:44:59 +13:00
coiax
f88184937a Glowsticks (#24761)
* Ports glowsticks from Bay

* Adds glowstick sprites

* Glowsticks in party crates, maint and emergency toolboxes
2017-03-08 02:38:15 -06:00
TalkingCactus
f04feec7a1 Adds Colored Lights for Energy Swords (#24765)
* colored lights for energy melee weapons

* New() -> Initialize()

* dualsabers

* woops?

* removes unused var

fixes energy axe typo
2017-03-08 02:34:50 -06:00
oranges
37b194d6ed Merge pull request #24708 from Cheridan/the_c_does_not_stand_for_cheesy
NERFS THE SHIT OUT OF C4+THROWING STARS BECAUSE ITS CHEESY AND SHAMEFUL
2017-03-08 09:46:12 +13:00
Joan Lung
774f7e3100 Fixes things having latches that shouldn't (#24715) 2017-03-07 12:19:57 +01:00
Supermichael777
f7a38c2113 Adds a Chameleon belt (#24569)
* adds a mildly evil belt

* adds the belt to a kit that sorely needed it
2017-03-07 09:10:36 +01:00
Xhuis
86488d18d3 Fixes some issues and closes others; nerfs abductor emergency teleporter (#24690)
* Fixes Wish Granter resurrection spam

* Fixes box icons

* Emergency teleporter nerf
2017-03-06 12:20:55 +01:00
Cheridan
14e384b2e8 c4 tweaks 2017-03-05 13:18:32 -06:00
PJB3005
64db72a150 Merge remote-tracking branch 'upstream/master' into rebase-to-vg 2017-03-04 16:31:55 +01:00
jughu
7e2fc83e1f Detective's revolver and ammo now starts in his holster (#24622)
* Update belt.dm

* Update security.dm

* Update belt.dm
2017-03-04 01:05:38 -06:00
Joan Lung
20f06bf820 I'm not very smart (#24648) 2017-03-03 11:47:29 -06:00
PJB3005
a63608d023 Merge remote-tracking branch 'upstream/master' into rebase-to-vg 2017-03-03 16:31:00 +01:00
coiax
b3a52289ef Posters refactor (#24548)
* Posters refactor

- Posters now use a simple type-per-poster definition, rather than some
large global lists requiring sprite numbers to be the same as entries in
a list.
- Putting a specific poster on a map now simply means putting the
specific type that you want, rather than var editing (often
unsuccessfully).
- There are random all-posters, random contraband posters, and random
official posters for mappers too.
- Ripped posters are now their own type.
- The potential to make additional classes of posters has been left
open, I'd like to move a bunch of the advertisement posters to their own
catagory, and clean up the "official" category to be more obviously
on-brand.

* Updates DeltaStation

* Changed the maps of Metastation

* OmegaStation posters updated

* Updated Pubby posters

* Map merged?

* Updated away mission and ruin posters

* Removes vars from garbage
2017-03-03 11:16:19 +13:00
Joan Lung
3706105960 Fixes brass box hinges (#24533)
* I regret making these a toolbox subtype

* consistency!
2017-03-02 19:31:11 +13:00
oranges
30953aba69 Merge pull request #24534 from Militaires/boxing
fixes boxes that dont use an illustration having writing on them
2017-03-02 19:30:39 +13:00
coiax
27d67a450b Minor implants refactor (#24378)
* Minor implants refactor

Fixes #24375.

Implant cases and implanters now have an `imp_type` var for making the
implant in New(), rather than individually creating the implant in
New(), which would have worked fine except when you try to create
subclasses of implanters.

* Initialize gt New
2017-03-01 13:51:56 +13:00
militaires
00ce587fb8 boxes 2017-02-27 23:58:59 +03:00
WJohn
299c7d4d52 Merge pull request #24450 from TrustyGun/box_autism
Improves box sprites
2017-02-26 19:45:37 -05:00
TrustyGun
e6cdb313a5 fixes syndie_box 2017-02-25 20:03:25 -05:00
Kyle Spier-Swenson
5ddeb50c29 Fixes progress bars when transferring between storages (#24413) 2017-02-25 17:51:30 -06:00
PKPenguin321
4d7cdce861 fixes paint and paint remover descs (#24417) 2017-02-25 17:49:13 -06:00
coiax
f7e6327d0a The theme of a chef box is also in the name (#24426)
Previously it was only in the description. Makes it slightly more
obvious.
2017-02-25 17:48:48 -06:00
Robustin
260667bee1 Hulks can no longer use Pneumatic Cannons or Flamethrowers (#24383)
Edit: Gave flamethrowers back to drones #ThanksKor
Edit2: This also includes the species check that locks out ash lizards and golems I think

🆑 Robustin
tweak: Hulks can no longer use pneumatic cannons or flamethrowers
/🆑
2017-02-25 15:52:37 +13:00
Joan Lung
ec226b4836 Moves His Grace's sprites to weapons.dmi (#24332)
* Moves His Grace's sprites to weapons.dmi

* hup

* here's my compromise
2017-02-25 14:42:40 +13:00
militaires
ce34afa14c fixes kommisar konflikts and the final hopefully commit to the purge of non-3/4 boxes 2017-02-24 12:03:06 +03:00