Commit Graph

212 Commits

Author SHA1 Message Date
Arokha Sieyes
85a489b9b6 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync 2017-04-04 20:25:00 -04:00
Cerebulon
340845babd Fixed various hand sprite issues.
Several circuit boards/modules did not have sprites despite hands sprites existing.
Green and pink lunch/tool boxes appeared in the wrong place in the right hand.
Fixed defib sprite for new code, and added jumper cable sprite.
2017-04-04 08:29:53 +01:00
Leshana
6eee55c983 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync
# Conflicts:
#	code/modules/client/preference_setup/general/03_body.dm
#	code/modules/mob/new_player/sprite_accessories.dm
#	html/changelogs/.all_changelog.yml
#	icons/mob/human_races/markings.dmi
#	vorestation.dme
2017-04-01 19:19:42 -04:00
MagmaRam
add4607d98 Merge pull request #3159 from Anewbe/electric_welder
Adds the electric welder
2017-03-28 19:56:43 -05:00
Anewbe
a65722929f Merge pull request #3086 from ghost/robot
Adds a fuckton of robot, hologram, and AI sprites.
2017-03-28 14:38:08 -05:00
Anewbe
d66e1beca0 Adds the electric welder 2017-03-27 22:43:20 -05:00
Arokha Sieyes
9edf3a6629 Polaris Merge Sync 2017-03-26 20:12:34 -04:00
Arokha Sieyes
fbb73e1ed8 Merge branch 'master' into robot 2017-03-22 18:45:25 -04:00
Anewbe
538f91c202 Borg stun arm should work now. 2017-03-22 17:06:16 -05:00
Arokha Sieyes
be9bcf81f0 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync 2017-03-21 11:22:29 -04:00
Atermonera
2d2763fdb0 Merge pull request #2 from PolarisSS13/master
There should probably be a way to do this automagically
2017-03-19 17:09:02 -07:00
Atermonera
530593508a Gives surgeonborgs the full medical hud, because why don't they already have it? 2017-03-19 16:58:53 -07:00
nachomeep
da9f80fb97 Adds a fuckton of robot + dead AI sprites. 2017-03-14 14:10:07 -04:00
killer653
3f1e5c80f2 Polaris sync 2017-02-01 15:08:45 -05:00
Anewbe
ac4b355f5e Surgical tools will no longer cause damage on help intent 2017-01-21 18:34:05 -06:00
Anewbe
2d72e609d1 Moves languages to use more defines. Redoes Diona splitting 2017-01-14 22:47:12 -06:00
killer653
0c73b9da2e Polaris December Sync 2016-12-10 09:51:11 -05:00
Yoshax
f4bf14c4e6 cleans up some missed stuff 2016-11-20 20:05:16 +00:00
Yoshax
d2ea8568a8 All robots now get crowbars, flashes and fire extinguishers 2016-11-20 19:41:25 +00:00
Eearslya Sleiarion
868413c880 Polaris Sync October 9th (#633) 2016-10-09 18:55:29 -04:00
Eearslya Sleiarion
b1b0f28938 Allow cyborg combat module in code red (#577)
* Allow cyborg combat module in code red

* Tweaks to combat module for balance purposes
2016-10-04 02:59:07 -04:00
Neerti
828dacf485 Centralizes weight class definitions
A lot of new defines are now in inventory_sizes.dm, which contains;
All the size identifiers (the thing that tells the game if something is bulky, or w/e).
Storage costs for all the sizes, which are exponents of two, as previously.
A few constants for inventory size.

Also changes all storage item's capacity definitions by basing it off of how many 'normal slots' exist for it.  This allows one to change the definition for all of the defines in the file, and everything will follow along without needing to change 500 files.  In testing, I made all ITEMSIZE_COST_* defines doubled, and nothing had broke.

The benefit of doing all of this is that it makes adding new weight classes in the future much simpler, and makes knowing how much space a container has easier, as seeing ITEMSIZE_COST_NORMAL * 7 means it can hold seven normal items.
2016-09-22 00:51:51 -04:00
Anewbe
aa81925b71 Adds Changelog 2016-08-13 23:18:51 -05:00
Anewbe
0cb1f8c27a Cleans up the code to match recent Tajaran rewrite 2016-08-13 23:07:00 -05:00
BlueNexus
9cdbae9c37 Added a bottle-gripper
Rename

To squash
2016-07-10 04:24:25 +01:00
Cameron653
002e768c79 Fixes combat robots not getting their modules. 2016-06-30 09:47:38 -04:00
Neerti
cbd4915420 Merge pull request #1592 from Anewbe/borg_changes
Various Borg Changes
2016-05-28 12:44:27 -04:00
Anewbe
d2b43bd5a4 Prevents the Robocalypse 2016-05-22 14:51:35 -05:00
Anewbe
aff4570134 Hopefully appeases Travis with commas 2016-05-16 21:48:42 -05:00
Anewbe
4b1e5c1de5 Fixes borg languages 2016-05-08 22:58:21 -05:00
Anewbe
573313c139 Adds floor tiles to Construction Module 2016-05-08 00:44:43 -05:00
Anewbe
8c6e7c2e4d Re-adds hide_on_manifest 2016-05-08 00:28:12 -05:00
Anewbe
db21ab2022 Fixes another thing 2016-05-08 00:16:51 -05:00
Anewbe
034802454e Fixed a thing 2016-05-08 00:10:29 -05:00
Anewbe
ac3ce2e7d1 Makes borgs more versatile 2016-05-07 23:52:03 -05:00
Atlantis
b239cf4b19 Adds synthetics to the crew manifest
- Synthetics now show on the crew manifest properly. This might as well be a bug fix since they already had the category, it just didn't work at all, since they don't have official security/medical/employment records.
- This does not mean synthetics are part of crew. They just show on the crew manifest for the sake of knowing who is in game when you are joining. I often saw people join a specific position, only to see that all work has already been done by a cyborg.
- As a note, Syndicate/Combat module cyborgs don't show on the manifest. Emagged cyborgs do show, however.
- This does not (probably) support the PDA manifest (which is currently broken anyway)
- Example screenshot: http://i.imgur.com/RSPuuom.png

🆑
rscadd: Cyborgs and the AI now show on the crew manifest.
:/cl:
2016-03-31 17:25:28 -04:00
Zuhayr
7c3993b68b Revert "Revert "Bay update."" 2016-02-07 16:33:30 +10:30
Zuhayr
98d983577c Revert "Bay update." 2016-02-07 16:07:05 +10:30
Zuhayr
e557a71fdc Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 2016-01-20 08:01:14 +10:30
Zuhayr
447d0e74ce Added a colour selector to the floor painter, added the floor painter to the construction and drone modules. 2016-01-02 07:05:45 +10:30
Zuhayr
7a8d88f5a9 Tweaks to the previous commits. 2015-12-11 15:55:31 +10:30
Zuhayr
d2399e5f66 Drones now get a jetpack and extinguishers. 2015-12-11 15:54:47 +10:30
Zuhayr
e9cdc8a0f5 Fixes #9257 2015-12-10 11:57:34 +10:30
Zuhayr
f1630108db Fixes #10915 2015-12-10 10:32:35 +10:30
Neerti
4f77afece1 Revert 58ef59734f 2015-11-08 10:09:14 -05:00
PsiOmegaDelta
19051ec27e Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-11-02 09:25:04 +01:00
PsiOmegaDelta
2ba9c7bc79 Allows drones to recharge their synth materials.
Fixes #11387.
2015-10-28 09:17:31 +01:00
PsiOmegaDelta
e37394e8fa Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/modules/mob/living/carbon/human/human_helpers.dm
	code/modules/reagents/reagent_containers/food/snacks.dm
2015-10-25 20:28:48 +01:00
PsiOmegaDelta
64176f1c4e Relocates synth flash recharge code.
Moves the flash recharge from security modules to all of them. Fixes #11322.
2015-10-18 17:55:56 +02:00
PsiOmegaDelta
aaba2c5c8c Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/modules/mob/living/silicon/robot/robot_modules.dm
2015-10-07 08:14:30 +02:00