Commit Graph

5039 Commits

Author SHA1 Message Date
Zuhayr e00e593988 Removed hair option with missing sprite. 2013-08-09 13:16:47 -07:00
Zuhayr cfc7dc73d9 Merge pull request #3465 from DJSnapshot/new_player
Changes to new_player.dm
2013-08-08 16:08:31 -07:00
DJSnapshot 0feea48cf8 Changed observe button warning to reflect 30 minute wait time. 2013-08-08 14:32:44 -07:00
Zuhayr 996c4d7a41 Added some appearance data back to monkey variants. 2013-08-08 22:56:56 -07:00
Segrain 047eb0b4a7 Fix for #3460. 2013-08-08 02:41:09 +03:00
Zuhayr f2fdbc6c83 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-08-07 21:30:45 -07:00
Zuhayr 52b9242c4f Compile fixes, blah. 2013-08-07 11:19:31 -07:00
Zuhayr 0447a8e3e5 Adjusted monkeyizing/humanizing procs to use species properly. 2013-08-07 11:13:13 -07:00
Zuhayr f9bf4db270 Monkeyize() now gibs the target if they don't have a species.primitive var set. 2013-08-07 10:46:53 -07:00
Zuhayr ef54d2f8b6 Monkeyize() now uses species primitive var. 2013-08-07 10:44:16 -07:00
Zuhayr b0b078658d Proper ghost hearing fix. 2013-08-07 10:25:40 -07:00
Zuhayr 0552c1fcfb Fix for ghosts being unable to understand alien languages. 2013-08-07 01:47:28 -07:00
Zuhayr b5d89b8929 Generalizes whitelist/species lists for datacore/preferences/new player code. Removes vox whitelist check from raid spawn. 2013-08-07 01:16:38 -07:00
Zuhayr e9a1272d34 Moved species defines to setup.dm, add whitelisted species global. 2013-08-07 01:12:11 -07:00
Akai Alonkai 2db7beb19c Removed Z-up function from Client/Center()
Turns out this was allowing mecha to travel semi-unrestricted upwards
through z-levels, including to Central Command and the Away Mission.
2013-08-06 10:46:23 -04:00
Mloc-Argent cf193b4893 Merge branch 'dev' of github.com:Baystation12/Baystation12 into dev 2013-08-05 22:53:25 +01:00
Mloc-Argent c0490ca81d String cleanup.
Removes VOX announcement system.
Cleans up a small amount of admin HTML procs.
Cleans tags off of the map.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-08-05 22:52:10 +01:00
Zuhayr 6f9b6e9704 Fixed language datum comparison, fixed staff of change runtime. 2013-08-06 07:33:07 -07:00
Zuhayr 98bbb095ad Swapped languages and datums over to global lists. Updated verbs. 2013-08-05 20:34:38 -07:00
comma e45f429e4c Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12
Conflicts:
	code/modules/mob/living/silicon/robot/robot.dm
	maps/tgstation.2.1.0.0.1.dmm
2013-08-04 01:40:32 +04:00
comma 625eecddaa Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into pain
Conflicts:
	html/changelog.html
2013-08-04 00:43:10 +04:00
comma 1bca7c7454 Made character HUD show pain level instead of actual health.
Pain are calculated based on health, but all damages contribute differently, for example 50u burn will feel like 100u, but 50u poisoning would only feel like 25u.
2013-08-04 00:12:38 +04:00
Zuhayr 840e4b7a7d Deleted a redundant file. 2013-08-04 01:45:20 -07:00
Zuhayr 610a3210e0 Continued species rewrite. Modified life.dm, moved species.dm around due to define issue. 2013-08-04 01:40:09 -07:00
Zuhayr b875ff021b Vast array of changes to replace mutantrace with species datum 2013-08-03 15:08:54 -07:00
Zuhayr 11621e3f8c Added pressure and temperature variables to species, checked them in life() to determine damage by-species. 2013-08-03 14:04:37 -07:00
Zuhayr 197f2a3e8b Commented out luchador string replacement. 2013-08-03 12:52:10 -07:00
Zuhayr dec28dda86 Merge branch 'feature' of https://github.com/Zuhayr/Baystation12 2013-08-03 12:41:46 -07:00
Zuhayr 27f7d1580d Merge branch 'feature' of https://github.com/Zuhayr/Baystation12 2013-08-02 20:16:50 -07:00
Zuhayr 618afa1be7 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 2013-08-03 09:16:41 -07:00
Zuhayr a8c04cefc6 Merge. 2013-08-03 09:14:20 -07:00
Segrain 826ce1c0f1 Fixes for handling embedded objects. 2013-08-02 19:32:58 +03:00
Segrain fb4552f394 Fix for #3383. Again. 2013-08-01 17:15:16 +03:00
comma 95f00d0523 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into medtweaks 2013-08-01 10:03:46 +04:00
Zuhayr b4e8c60472 Merge resolution. 2013-07-31 19:21:58 -07:00
comma de1309102e Splints!
Actually added 2 commits before, but now with full capabilities.
2013-08-01 05:58:55 +04:00
Zuhayr f50256eabb Work progresses on species datums. Mass-commit due to repo issues requiring a reset. 2013-07-31 11:50:56 -07:00
Zuhayr 2644684a81 Proper runtime fix for ablative armour and tasers. 2013-07-31 07:30:57 -07:00
Zuhayr 486f46d71e Moved around podmen code, adjusted a lot of strings, rewrote/modified a lot of the podman generation code, added podman icons, commented out potato person green tint. 2013-07-31 04:17:17 -07:00
Zuhayr 361ecb4e2b Merge resolution. 2013-07-30 17:33:18 -07:00
Segrain 578a020c8b Fix for #3392. 2013-07-30 12:15:12 +03:00
Zuhayr a39aff3471 Removed a very very redundant check in the ablative armour code. Thanks Segrain. 2013-07-29 12:51:20 -07:00
Zuhayr b1ac1d58f9 Fixes #3383 2013-07-29 12:15:04 -07:00
Zuhayr c361e6f4b7 Commented out debug string. 2013-07-29 16:55:03 -07:00
Zuhayr 6c53208115 Taser and examine fixes. 2013-07-29 16:50:37 -07:00
Zuhayr 2d45713d69 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 2013-07-29 15:47:44 -07:00
Segrain ea320dca67 Conflict fix? 2013-07-29 08:15:54 +03:00
Segrain da2786891a Fix for #3337. 2013-07-29 08:12:02 +03:00
Zuhayr af1f0108a2 Armalis pinning fix. 2013-07-29 07:06:55 -07:00
Segrain 3c4b7507e9 Reactiveness 'quick'fix. 2013-07-28 13:02:10 +03:00