Jordie
26d75cc5ba
Merge pull request #9863 from MrPerson/508_compilation
...
Makes the game compile in byond version 508
2015-06-16 19:38:11 +10:00
phil235
ae8c69f9a7
Merge pull request #9955 from kingofkosmos/spanspaceremoval
...
Unnecessary space removal from spans and messages
2015-06-15 18:20:04 +02:00
Jordie0608
8fc003029c
Merge branch 'master' of https://github.com/tgstation/-tg-station into ironicthatonehumanisasectorzerolaw
...
Conflicts:
code/modules/mob/living/silicon/robot/robot.dm
2015-06-15 16:34:56 +10:00
kingofkosmos
c8d79e7034
Removed unnecessary spaces in these situations:
...
"span class = '" changed to "span class='"
"'> " changed to "'>"
2015-06-14 12:13:19 +03:00
Razharas
b7150068cc
Merge pull request #9783 from nukeop/master
...
Adds a chemistry bag for moving large amounts of patches/pills/bottles at once
2015-06-13 04:42:16 +03:00
Razharas
4373f6eece
Merge pull request #9904 from xxalpha/runtimesrun
...
Fixes three runtimes.
2015-06-13 04:29:20 +03:00
Ikarrus
78ec879f27
- Ghosts can hear gang messages
...
- Gang spraycans no longer have a unique name for more stealth
2015-06-12 08:22:42 -06:00
Ikarrus
d2ef043690
Resolved Conflicts:
...
code/modules/mob/living/living.dm
2015-06-11 23:46:59 -06:00
xxalpha
9ba7e6aaf4
Fixes three runtimes.
...
Better fix. src. purge
2015-06-11 21:30:13 +01:00
Cheridan
7363088cbc
Merge pull request #9802 from Miauw62/AyeEye
...
Nerfs the AI in several minor ways.
2015-06-11 14:13:52 -05:00
Cheridan
808ffb4160
Merge pull request #9902 from Miauw62/inexperience
...
Removes strip_html_properly(), replaces it with html_encode().
2015-06-11 10:31:53 -05:00
Remie Richards
1800c56456
Merge pull request #9769 from Cheridan/ACTUAL_FUN_REMOVAL
...
Adjusts Chaplain Special Bible Equipment
2015-06-11 16:15:41 +01:00
Miauw
a881478743
Removes strip_html_properly(), replaces it with html_encode().
...
It was not as proper as the name would imply, and experience and amused redditors have taught me that writing a proper HTML-scrubbing function is a very hard task indeed.
2015-06-11 15:37:41 +02:00
Ikarrus
59d9098d26
Gang Update
2015-06-10 23:05:58 -06:00
Razharas
b873176a77
Merge pull request #9821 from Cheridan/just_cuff_my_shit_up
...
REMOVES CABLE CUFFS...
2015-06-10 01:17:35 +03:00
MrPerson
7c3cb399d0
Makes the game compile in byond version 508
...
throw is a reserved keyword so all throw() and var/throw had to be renamed.
Only compile tested because I'm fucking lazy.
2015-06-09 04:14:12 -07:00
Cheridan
d7e3363129
Merge pull request #9817 from xxalpha/dropfixes
...
Fixed hacking from inside machines.
2015-06-08 21:27:32 -05:00
Cheridan
29c2bb474d
Merge pull request #9804 from Firecage/Exwelder
...
Adds the experimental welder to R&D + adds some descriptions.
2015-06-07 21:23:45 -05:00
Cheridan
46acc2a55d
REMOVES CABLE CUFF
2015-06-06 16:21:41 -05:00
Miauw
3c59772025
Polishes the AI nerfs a bit:
...
* Removed camera wires.
* Tracking time is now dependant on distance to eye instead of core.
* AI detectors will light up when the AI tracks you.
Also added a changelog.
2015-06-06 16:51:09 +02:00
xxalpha
9cb1061bfb
Fixed hacking from inside machines and more.
2015-06-06 11:34:12 +01:00
Firecage
ab4725f709
Makes the experimental welder only regen fuel while off.
2015-06-06 11:37:59 +02:00
Cheridan
9e65cdeb6a
Merge pull request #9391 from Ikarrus/gangmessaging
...
Gang-Wide Messages
2015-06-05 22:01:54 -05:00
Firecage
89e2fbf0bb
Adds the experimental welder to R&D + adds some descriptions.
2015-06-05 20:43:21 +02:00
Cheridan
05072bcf31
Merge pull request #9771 from xxalpha/dropitlikeits
...
Fixed PDA accepting items when spessmen can't drop items.
2015-06-04 20:04:04 -05:00
barackobama
1443ee1c75
add icon for chemistry bag
...
add two chemistry bags to the chemistry closet
add an option to make a chemistry bag to the biogenerator for 200 points
2015-06-04 19:17:44 +01:00
Barack Obama
8184d71a1e
add chemistry bag
2015-06-04 14:18:49 +01:00
xxalpha
ecb15b21c2
Fixed PDA accepting items when spessmen can't drop items.
2015-06-03 20:16:11 +01:00
Cheridan
e4999fd233
Merge pull request #9719 from CandyClownTG/patch-1
...
Ointments and bruise packs stacking
2015-06-03 00:51:02 -05:00
Cheridan
6618ead426
Readds The Clown Mask
...
lame gimmick chaplains rejoice i guess
2015-06-03 00:32:25 -05:00
Cheridan
6adb4c9507
Adjusts Chaplain Special Bible Equipment
2015-06-03 00:22:53 -05:00
Cheridan
a19f1801ff
Merge pull request #9699 from KorPhaeron/turf
...
Changes how destroying/building turfs works
2015-06-02 23:15:42 -05:00
Cheridan
2d998452db
Merge pull request #9715 from Firecage/datumspaths
...
Changes alot of datum/ to /datum/, also includes other path types such as /obj/
2015-06-02 23:04:51 -05:00
Cheridan
d31f534446
Merge pull request #9745 from Incoming5643/super_bummer_man_64
...
Fixes overexcited TTV reporting
2015-06-02 22:04:20 -05:00
Cheridan
905f350597
Merge branch 'unsimulatedIsKill2' of git://github.com/Aranclanos/-tg-station into Aranclanos-unsimulatedIsKill2
...
Conflicts:
code/game/smoothwall.dm
2015-06-02 13:45:56 -05:00
Incoming
e608a16edf
Tank Transfer Valves won't pester the admins if the volume of the two tanks are equivilent before they are mixed. 99999/100000 times this means that the tank was already opened once and fouled, and the remaining 1/100000 the toxins guy was AMAZINGLY crap at his job.
2015-06-01 23:11:42 -04:00
Aranclanos
e7c0d7e95c
Removes unsimulated turfs.
...
Moves shuttle turfs to paths under /turf/simulated/floor and /turf/simulated/wall
Players can now safely build on top of shuttle turfs
Fixes #1711
Adds several but not all paths for the different types of floor turfs, most of them in plasteel_floor.dm
The turf pathings are still in need of a deeper organization, but this is at least a start
2015-06-01 23:24:18 -03:00
Incoming
061478165a
upgrades the HARDFEET species flag to PIERCEIMMUNE
...
In addition to keeping golem feet safe as always golems are now immune to object embeding. As a mitagating nerf and logical extension, golems can no longer be injected with chems either.
2015-05-31 18:54:30 -04:00
Cheridan
e3b92f0caf
Merge pull request #9656 from bear1ake/pda-id-drop-fix-2
...
Fix for #4219 . Variant 2
2015-05-31 14:35:00 -05:00
Cheridan
426fa3c18d
Merge pull request #9680 from kingofkosmos/healthscannerchanges
...
Health analyzer output reordering
2015-05-31 14:12:09 -05:00
Firecage
f79e0fc1aa
Updates more paths, for example obj/stuff to /obj/stuff
2015-05-31 17:48:33 +02:00
CandyClownTG
b158d35536
Update medical.dm
...
Ointments and bruise packs are now in stacks of 6 instead of 5.
2015-05-31 02:37:07 -04:00
Firecage
84e8690ec6
merge conflict fix
2015-05-31 02:45:46 +02:00
Firecage
3a826fe13c
Changes alot of datum/ to /datum/
2015-05-31 02:40:54 +02:00
kingofkosmos
0588647ba4
Switched up the order of shown damages.
2015-05-30 11:37:22 +03:00
KorPhaeron
bfe5e4a855
Cleaning up turf code
...
Changes colons and spaces I forgot you could do this on github
2015-05-29 19:27:28 -05:00
KorPhaeron
97990c94cc
Changes how destroying turfs works
...
Turfs now have a baseturf var which determines what is "under" every
turf. The default is space.
Actions that previously did changeturf(/turf/space) (like bombs or RCD
deconstruction) now do changeturf(baseturf). Functionally the same for
the station, but allows special turf types that don't break to space
(such as planet tiles).
Right now the asteroid tiles are the only thing with a baseturf other
than space (the baseturf is an asteroid tile).
Baseturf is tracked when new things are built, so building a floor and
then a wall on the asteroid tile, and then bombing that wall will return
it to an asteroid tile, not space.
Allows building on asteroid tiles now that doing so wont randomly make
holes to space. Time for giant mining forts.
I should have done this years ago for away missions.
Also added myself to admins.txt
2015-05-29 18:43:34 -05:00
Razharas
6f86281d0e
Merge pull request #9660 from Cheridan/auth_button
...
fixes #9599 weapons auth button
2015-05-29 15:15:16 +03:00
Cheridan
10f2b7ae00
Merge pull request #9559 from xxalpha/cardtrick
...
Card deck fixes and storage fixes.
2015-05-28 21:41:00 -05:00
kingofkosmos
361693d7f8
Reordered stuff.
2015-05-28 20:48:23 +03:00