7de04b6c3c
Merge branch 'master' into spaceareas
2014-02-24 17:47:19 -05:00
ded7b01f5f
Merge pull request #2829 from Razharas/LifeLikeTexture
...
Autolathe improvements
2014-02-24 16:27:16 -06:00
0484924e95
Merge pull request #2882 from Miauw62/diojagijasdgjisagopagpjsagpoagpjga
...
Fixed #2880 horse mask removable
2014-02-24 15:57:39 -06:00
ef1710a058
Fixed horsemasks properly
2014-02-23 19:01:35 +01:00
e6c856e456
Merge pull request #2803 from Rockdtben/SyndCardDesc
...
Synd card desc
2014-02-23 13:46:10 -02:00
b44c6ffdf9
Merge pull request #2801 from Razharas/Vendors
...
Vendor fixes and stuff
2014-02-22 14:22:11 -02:00
a651ff1c67
Fix for runtime after spawn in diseases
...
What a twist
2014-02-21 18:07:04 +04:00
ff27f5d426
Merge pull request #2826 from YotaXP/polaroid-fix
...
Long overdue fixes to the Polaroid cameras.
2014-02-20 16:22:59 -08:00
1d6981c2d3
Remove name checks
2014-02-19 17:23:57 -05:00
965e7ad6d8
Merge to master
...
Conflicts in mob.dm
2014-02-18 23:59:59 +02:00
35ba26b3ea
Fixed coloring, overlays on overlays, and blood trails.
2014-02-18 16:54:22 -05:00
befd05f1ff
Fixing copypaste issues
...
Thanks RR
2014-02-18 23:50:43 +04:00
71c551b295
Fixing merge conflicts
...
Yep
2014-02-18 23:48:35 +04:00
d844bbd1ee
Autolathe improvements
...
Tided up the code
Made it use generic datum wires , vars and sexier menu
Didnt change it gameplay-wise
2014-02-18 18:36:09 +04:00
8cca6e3cbb
Changed uplink description
2014-02-15 10:47:36 -06:00
3f9bf15ca5
Merge branch 'master' of https://github.com/tgstation/-tg-station into NODROP
...
Conflicts:
code/modules/mob/mob.dm
2014-02-15 17:30:21 +01:00
1c9a7a615f
Vendor fixes
...
Fixes some bugs, makes vendors drop refillers on deconstruction and
generally use refillers more
2014-02-15 18:10:11 +04:00
9a27f7d39b
Merge remote-tracking branch 'origin/spellsFromBodyToMind' into spellsFromBodyToMind
...
Conflicts (Resolved):
code/game/gamemodes/wizard/artefact.dm
config/admins.txt
2014-02-14 21:00:10 +02:00
7ca06565b5
Merge remote-tracking branch 'upstream/master' into spellsFromBodyToMind
...
Conflicts (Resolved):
code/datums/spells/mind_transfer.dm
code/game/gamemodes/wizard/artefact.dm
code/modules/mob/mob.dm
code/modules/projectiles/projectile/change.dm
2014-02-14 20:57:11 +02:00
9b8656247c
u_equip is now called unEquip PANIC
2014-02-13 20:58:33 +01:00
b8b57ff4f1
Replaced canremove with NODROP.
2014-02-13 19:52:46 +01:00
1307a9e388
Makes NODROP work for carbons, adds sanity checks to u_equip calls.
2014-02-12 21:08:09 +01:00
8c7ef19be6
Replaced before_take_item() and drop_from_inventory() with u_equip
2014-02-12 19:51:37 +01:00
747fd636af
Merge pull request #2667 from Incoming5643/mindswapassurance
...
Removes the RNG spell loss from mindswap
2014-02-11 17:00:21 +00:00
2165eb22f6
Removes that silly "you're not in your body!" message
...
Also a var I forgot to remove earlier
2014-02-09 17:22:32 -05:00
e1a58798f2
Merge pull request #2652 from Incoming5643/showodds
...
Adds a new game option: show_game_type_odds
2014-02-08 10:30:57 -08:00
7346cfff8b
Removes the RNG spell loss from mindswap.
...
Had a plan for a stealthy wizard round using mindswap? Whoops looks like you just lost knock because fuck you.
It was well coded but people don't use mindswap enough to warrent a threat of permacrippling on use. To the creator's credit was very easy to take out.
2014-02-06 20:49:56 -05:00
d9d75ada32
Adds a new game option: slow_game_type_odds
...
If it's on on the server revision screen below the preexisting information there will be a readout showing the raw chance of each round type occuring. This doesn't tell anyone what the current round type is, it just shows what the odds are.
It defaults to off
2014-02-05 17:58:07 -05:00
1d55017853
Update supplypacks.dm
...
Added an extra kit to the supply crate.
2014-02-04 21:50:54 -05:00
e2293f5de6
Update supplypacks.dm
...
Renamed crate.
2014-02-04 09:00:45 -05:00
2d3c91af83
Update supplypacks.dm
...
Adds a lasertag crate
2014-02-03 22:53:06 -05:00
08277fe851
Prevents the airlock deny animation when the airlock is open (eg. when pulsing
...
the ID wire of an emagged airlock).
2014-01-31 06:55:27 +01:00
7009c447f1
Merge pull request #2393 from Balrog-was-here/inb4gambittraitor
...
[MAP] Syndicate playing cards and deck style support for playing cards
2014-01-26 12:19:11 -08:00
484b31ccea
Merge pull request #2457 from Giacom/dart_fix
...
Fixes #2456 and new Add Reagent varedit option.
2014-01-26 11:06:46 -08:00
461415430e
Merge remote-tracking branch 'origin/master' into inb4gambittraitor
...
Conflicts:
icons/obj/toy.dmi
2014-01-26 14:02:35 -05:00
4b51e6d386
Merge branch 'master' of https://github.com/tgstation/-tg-station into pr/2371
2014-01-22 20:01:11 +00:00
6a497b98ad
Added the SetEmagged proc, for cyborgs, and replaced code to use it.
...
Added get_inactive_modules and get_usable_modules procs to use while looping through the cyborg's modules.
The cyborg's storage screen will now shrink if there is an empty row.
Added a new on_emag proc for modules, which is called when the module is emagged. Miner borgs use it to replace their borg drill for a diamond one.
Fixes a runtime where there is no client to update the hud.
Fixes a bug where if you emag a cyborg with no module and when they choose a miner they do not receive their diamond drill.
2014-01-22 20:00:39 +00:00
1256500ca2
Fixes #2456 by moving the code which transfers the reagents to ready_proj()
...
Removed excluded obsolete files.
Adds a new option to view variables which allows you to add reagents, useful for debugging reagents.
2014-01-20 14:20:54 +00:00
12998c0641
Fixes issue #1828 (Wizard Perma-Mutate)
...
Fixes Issue #1828 (Wizard Perma-Mutate)
- added centcomm check
2014-01-19 03:13:17 +01:00
fe8dba3dc1
Refactored card code to remove copypasted variable assignment. Card objects are now children of /obj/item/toy/cards.
2014-01-18 20:14:21 -05:00
574e240649
Merge remote-tracking branch 'origin/master' into inb4gambittraitor
2014-01-16 16:21:46 -05:00
6704a9948d
Merge branch 'master' of https://github.com/tgstation/-tg-station into dalawisfluid
2014-01-16 19:46:04 +01:00
5a6f29b3d5
Added syndicate playing cards. As a consequence card code now supports multiple deck styles.
2014-01-14 20:24:53 -05:00
a7e5165703
Puts the mime's vow of silence to his mind
...
- cleaned up emotes
- put the mime’s vow of silence and his spells to his mind
- merge conflicts resolved
2014-01-14 21:58:00 +02:00
84ee1ca8b1
Merge pull request #2314 from Giacom/toxin_filter
...
Symptom Fixes.
2014-01-13 13:20:29 -08:00
0b2a1b7ac4
Merge pull request #2323 from dumpdavidson/empkit_balance
...
Balance changes to the EMP kit
2014-01-12 13:09:56 -08:00
6dc7736933
Merge pull request #2244 from VistaPOWA/syndieborgs
...
[MAP] Adds Syndicate Borgs
2014-01-12 05:30:22 -08:00
cf672d2c29
Balance changes to the EMP kit:
...
- EMP-Flashlight now has one charge less but recharges (slower than lasers/energy crossbows do)
- EMP-Flashlight description no longer reveals the nature of the device
- EMP implant now has two uses
- EMP kit now contains two grenades
- EMP and adrenaline implants now inform the user how many charges they contain to begin with (freedom doesn't because it's intentionally random)
- Fixes EMP flashlight sometimes going down to -1 charges.
2014-01-11 21:04:35 +01:00
c8120da49c
Merge pull request #2283 from YotaXP/list2text-refactor
...
Optimized and refactored list2text, text2list, and replacetext.
2014-01-11 10:11:13 -08:00
17095d3430
Adds additional check to syndieborg teleporter spawning, removes a redundant proc
2014-01-11 17:44:53 +01:00
AlexanderUlanH
Cheridan
Miauw
Aranclanos
Razharas
Razharas
Perakp
YotaXP
Rockdtben
fleure
Incoming5643
Mercenaryblue
metaglog
Balrog
Giacomand
lokxy
dumpdavidson
VistaPOWA